]> SALOME platform Git repositories - tools/eficas.git/commitdiff
Salome HOME
*** empty log message ***
authorPascale Noyret <pascale.noyret@edf.fr>
Wed, 5 Mar 2008 09:13:48 +0000 (09:13 +0000)
committerPascale Noyret <pascale.noyret@edf.fr>
Wed, 5 Mar 2008 09:13:48 +0000 (09:13 +0000)
38 files changed:
Aster/sdist.py
InterfaceQT/browser.py
InterfaceQT/compoparam.py
InterfaceQT/editor.py
InterfaceQT/monCommentairePanel.py
InterfaceQT/monFonctionPanel.py
InterfaceQT/monIncludePanel.py
InterfaceQT/monParamPanel.py
InterfaceQT/monPlusieursASSDPanel.py
InterfaceQT/monPlusieursBasePanel.py
InterfaceQT/monPlusieursIntoPanel.py
InterfaceQT/monPoursuitePanel.py
InterfaceQT/monUniqueASSDPanel.py
InterfaceQT/monUniqueBasePanel.py
InterfaceQT/monUniqueCompPanel.py
InterfaceQT/monUniqueSDCOIntoPanel.py
InterfaceQT/qtCommun.py
InterfaceQT/qtEficas.py
InterfaceQT/qtSaisie.py
InterfaceQT/typeNode.py
InterfaceQT/viewManager.py
Noyau/N_VALIDATOR.py
Ui/desFormule.py
Ui/desFormule.ui
Ui/desPlusieursBase.py
Ui/desPlusieursBase.ui
Ui/desPlusieursInto.py
Ui/desPlusieursInto.ui
Ui/desUniqueASSD.py
Ui/desUniqueASSD.ui
Ui/desUniqueBase.py
Ui/desUniqueBase.ui
Ui/desUniqueInto.py
Ui/desUniqueInto.ui
Ui/desUniqueSDCO.py
Ui/desUniqueSDCO.ui
Ui/desUniqueSDCOInto.py
Ui/desUniqueSDCOInto.ui

index 2fbe5d2517d92093036a26e021363752da26b7a2..9b0f3af71107d1f0b6653931f2214e0a09826c54 100644 (file)
@@ -39,7 +39,7 @@ def main():
    copyfiles('../Editeur',os.path.join(path_distrib,'Editeur'),['*.py','faqs.txt'])
    copyfiles('../InterfaceTK',os.path.join(path_distrib,'InterfaceTK'),['*.py','faqs.txt'])
    copyfiles('../InterfaceQT',os.path.join(path_distrib,'InterfaceQT'),['*.py'])
-   copyfiles('../Ui',os.path.join(path_distrib,'Ui'),['*.ui',Makefile])
+   copyfiles('../Ui',os.path.join(path_distrib,'Ui'),['*.ui','makefile'])
    copyfiles('../Traducteur',os.path.join(path_distrib,'Traducteur'),['*.py'])
    copyfiles('../Ihm',os.path.join(path_distrib,'Ihm'),['*.py'])
    copyfiles('../Extensions',os.path.join(path_distrib,'Extensions'),['*.py'])
index 060579ba865bfef67888eaad29cdbbadca4581b7..5dec0e42e654f5c189053c41ee4c1e2942edcba8 100644 (file)
@@ -27,6 +27,8 @@ class JDCTree( QListView ):
                      self.handleContextMenu)
 
         self.connect(self, SIGNAL("onItem ( QListViewItem * ) "), self.handleOnItem)
+        self.connect(self, SIGNAL('mouseButtonPressed(int, QListViewItem*, const QPoint&, int)'),
+                     self.handleNommeItem)
         
         
     def handleContextMenu(self,itm,coord,col):
@@ -43,6 +45,19 @@ class JDCTree( QListView ):
         except:
             pass
             
+    def handleNommeItem(self,bouton,itm,coord,col):
+        """
+        PN --> a finir eventuellement pour nommer
+        le concept dans l arbre
+        """
+        try :
+            if itm :
+               panel=itm.getPanel()
+               if panel.node.item.object.get_type_produit() != None :
+                  pass
+        except:
+            pass
+
     def handleOnItem(self,  item ):
         fr = item.item.get_fr()
         if self.editor:
@@ -192,6 +207,7 @@ class JDCNode(QListViewItem):
         self.item.connect("add",self.onAdd,())
         self.item.connect("supp",self.onSupp,())
         self.item.connect("valid",self.onValid,())
+
            
     def commentIt(self):
         """
index 64a785853b84861d8c0ae243e9745d4c50b0fded..bd9bd069a11108430223f8ce2020a368b0159d28 100644 (file)
@@ -15,7 +15,7 @@ import browser
 import typeNode
 
 
-class Node(browser.JDCNode,typeNode.PopUpMenuNode): 
+class Node(browser.JDCNode,typeNode.PopUpMenuNodePartiel): 
     def getPanel(self):
         """        
         """    
@@ -23,8 +23,7 @@ class Node(browser.JDCNode,typeNode.PopUpMenuNode):
         return MonParamPanel(self, parent=self.editor )
 
     def createPopUpMenu(self):
-        typeNode.PopUpMenuNode.createPopUpMenu(self)
-
+        typeNode.PopUpMenuNodePartiel.createPopUpMenu(self)
 
 
 
@@ -66,10 +65,10 @@ class PARAMTreeItem(Objecttreeitem.ObjectTreeItem):
 
     def GetText(self):
       """
-      Retourne le texte à afficher aprês le nom de la commande (ici aprês 'paramêtre')
+      Retourne le texte à afficher aprês le nom de la commande (ici apres 'paramêtre')
       Ce texte est tronqué à 25 caractêres
       """
-      texte = repr(self.object)
+      texte=self.object.nom+"="+repr(self.object.valeur)
       texte = string.split(texte,'\n')[0]
       if len(texte) < 25 :
           return texte
index 01268b3c939be7783c5894d01d229a22d0dad967..b805e3130a2ba43e93b61305b9783fa975e523a4 100644 (file)
@@ -30,14 +30,16 @@ class JDCEditor(QSplitter):
        Editeur de jdc
     """        
 
-    def __init__(self,fn = None, jdc = None ,parent=None, editor = None, units = None):          
-    #--------------------------------------------------------------------------------#
+    def __init__(self,fn = None, jdc = None ,parent=None, editor = None, units = None, include=0):          
+    #-------------------------------------------------------------------------------------------#
 
         QSplitter.__init__(self, parent,'')
         
         VERSION_CODE    = session.d_env.cata
+        self.salome=0
        self.parent         = parent
-        self.salome         = self.parent.salome
+        if parent != None :
+           self.salome         = self.parent.salome
         self.top  = None
         self.code = prefs.code
         self.version_code = VERSION_CODE
@@ -104,7 +106,10 @@ class JDCEditor(QSplitter):
             self.jdc = editor.jdc            
         else: 
             if not self.jdc:                   #  nouveau jdc
-                self.jdc = self._newJDC(units=units)
+                if not include :
+                   self.jdc = self._newJDC(units=units)
+                else :
+                   self.jdc = self._newJDCInclude(units=units)
                 nouveau=1
         
         if self.jdc:            
@@ -198,6 +203,37 @@ class JDCEditor(QSplitter):
         jdc.analyse()        
         return jdc
         
+    #--------------------------------#
+    def _newJDCInclude( self ,units = None):        
+    #--------------------------------#
+        """
+        Initialise un nouveau JDC vierge
+        """
+        import Extensions.jdc_include
+        JdC_aux=Extensions.jdc_include.JdC_include
+        CONTEXT.unset_current_step()        
+
+        jaux=self.readercata.cata[0].JdC( procedure="",
+                               appli=self,
+                               cata=self.readercata.cata,
+                               cata_ord_dico=self.readercata.cata_ordonne_dico,
+                               rep_mat=self.CONFIGURATION.rep_mat,
+                              )
+        jaux.analyse()
+
+        J=JdC_aux( procedure="",
+                   appli=self,
+                   cata=self.readercata.cata,
+                   cata_ord_dico=self.readercata.cata_ordonne_dico,
+                   jdc_pere=jaux,
+                   rep_mat=self.CONFIGURATION.rep_mat,
+                   )
+        J.analyse()
+        if units is not None:
+           J.recorded_units=units
+           J.old_recorded_units=units
+        return J
+
             
     #-----------------------#
     def get_source(self,file):
@@ -298,7 +334,10 @@ class JDCEditor(QSplitter):
         self.modified = False
                         
         qApp.restoreOverrideCursor()        
-        self.lastModified = self.fileInfo.lastModified()
+        if self.fileInfo!= None : 
+           self.lastModified = self.fileInfo.lastModified()
+        else :
+           self.lastModified = 1
         return jdc
         
     #----------------------------------------------#
@@ -313,10 +352,10 @@ class JDCEditor(QSplitter):
     def viewJdcSource(self):        
     #-----------------------#
         format = self.format_fichier
-        #f=open(self.JDCDisplay_courant.fichier,'r')
-        #texteSource=f.read()
-        #f.close()
-        #self._viewText(texteSource, "JDC_SOURCE")
+        f=open(self.fileName,'r')
+        texteSource=f.read()
+        f.close()
+        self._viewText(texteSource, "JDC_SOURCE")
                 
     #-----------------------#
     def viewJdcPy(self):        
index 2a60ddbdb718ba82d8dccf762aab8beb2c536e1f..4a983a46c66b3783245229e2ed4747833ffc63fb 100644 (file)
@@ -27,19 +27,22 @@ from qt import *
 
 from desCommentaire import DComment
 from qtCommun      import QTPanel
+from qtCommun      import QTPanelTBW2
+
 import prefs
 
 # Import des panels
 
-class MonCommentairePanel(DComment,QTPanel):
+class MonCommentairePanel(DComment,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):
-        QTPanel.__init__(self,node,parent)
         DComment.__init__(self,parent,name,fl)
+        QTPanel.__init__(self,node,parent)
+        QTPanelTBW2.__init__(self,node,parent)
         self.RemplitPanel()
 
   def RemplitPanel(self):
@@ -52,3 +55,24 @@ class MonCommentairePanel(DComment,QTPanel):
         self.node.item.set_valeur(texte)
         self.node.onValid()
 
+  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 BNextPressed(self) :
+      QTPanelTBW2.BNextPressed(self)
+
+  def BOkPressed(self):
+      QTPanel.BOkPressed(self)
+
+  def ViewDoc(self):
+      QTPanel.ViewDoc(self)
+
index 36d3d9650db8cdf297137caf905a7e99a9ab1aac..8a0a3f3dda2e0aa657042bcb8e052e793966ed6d 100644 (file)
@@ -52,7 +52,8 @@ class MonFonctionPanel(MonPlusieursBasePanel):
         l_valeurs=[]
         if (len(liste)% self.nbValeurs != 0):
             message="La cardinalité n'est pas correcte, la dernière valeur est ignorée"
-            self.Commentaire.setText(QString(commentaire)) 
+            #self.Commentaire.setText(QString(commentaire)) 
+            self.editor.affiche_infos(commentaire)
         for i in range(len(liste)/ self.nbValeurs) :
             if (self.nbValeurs==2):
               t=(liste[i*self.nbValeurs], liste[i*self.nbValeurs+1])
@@ -81,7 +82,8 @@ class MonFonctionPanel(MonPlusieursBasePanel):
             commentaire += QString(" n est pas un tuple de ") 
             commentaire += QString(str(self.nbValeurs)) 
             commentaire += QString(" valeurs")
-            self.Commentaire.setText(commentaire)
+            #self.Commentaire.setText(commentaire)
+            self.editor.affiche_infos(commentaire)
             return
 
         index=self.LBValeurs.currentItem() +1
@@ -109,7 +111,8 @@ class MonFonctionPanel(MonPlusieursBasePanel):
   def AjoutNValeur(self,liste) :
         if len(liste)%self.nbValeurs != 0 :
            texte="Nombre de valeur incorrecte"
-           self.Commentaire.setText(texte)
+           #self.Commentaire.setText(texte)
+           self.editor.affiche_infos(texte)
            return
         listeDecoupee=self.DecoupeListeValeurs(liste)
         for vals in listeDecoupee :
index a9dce88a2dbbc82ad34c31e5d614d82ca806fd14..3c1eba09ecfde999b993ebb307f2f6ee563296cc 100644 (file)
@@ -95,6 +95,7 @@ class MonIncludePanel(MonMacroPanel):
         if not os.path.isfile(nomFichier) :
            commentaire = "Fichier introuvable"
            self.Commentaire.setText(QString(commentaire))
+           self.editor.affiche_infos(commentaire)
            return
 
         text=self.convert_file(nomFichier)
@@ -107,11 +108,13 @@ class MonIncludePanel(MonMacroPanel):
            self.node.item.object.change_fichier_init(nomFichier,text)
            commentaire = "Fichier modifie  : " + self.node.item.get_nom()
            self.Commentaire.setText(QString(commentaire))
+           self.editor.affiche_infos(commentaire)
         except: 
            l=traceback.format_exception_only("Fichier invalide",sys.exc_info()[1])
            QMessageBox.critical( self, "Erreur fatale au chargement du fichier Include", l[0])
            commentaire = "Fichier invalide" 
            self.Commentaire.setText(QString(commentaire))
+           self.editor.affiche_infos(commentaire)
            return
 
 
@@ -129,5 +132,6 @@ class MonIncludePanel(MonMacroPanel):
        else :
             commentaire = "Impossible de lire le fichier : Format inconnu"
             self.Commentaire.setText(QString(commentaire))
+            self.editor.affiche_infos(commentaire)
        return text
 
index d1917d5755dcb46e1ef31aed8d7ff97c4a1e827e..facf0973637a9fd8f36b97f5d24cdc5455350a58 100644 (file)
@@ -27,8 +27,8 @@ import prefs
 from qt import *
 
 from desParam import DParam
-from qtCommun      import QTPanel
-from qtCommun      import QTPanelTBW2
+from qtCommun import QTPanel
+from qtCommun import QTPanelTBW2
 
 # Import des panels
 
@@ -49,11 +49,8 @@ class MonParamPanel(DParam,QTPanelTBW2,QTPanel):
         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)
+           #str=QString("").setNum(valeur)
+           self.lineEditVal.setText(repr(valeur))
         else :
            self.lineEditVal.clear()
 
@@ -63,6 +60,7 @@ class MonParamPanel(DParam,QTPanelTBW2,QTPanel):
         if not nom :
            commentaire="Entrer un nom de parametre"
            self.Commentaire.setText(QString(commentaire))
+           self.editor.affiche_infos(commentaire)
            return
         self.node.item.set_nom(nom)
         self.node.item.set_valeur(val)
@@ -108,6 +106,7 @@ class MonParamPanel(DParam,QTPanelTBW2,QTPanel):
         else :
            commentaire="Les noms de parametre doivent commencer par une lettre"
            self.Commentaire.setText(QString(commentaire))
+           self.editor.affiche_infos(commentaire)
            return None
 
   def BuildTabCommand(self):
index 9b7ea7f94d105f5122fb21c943843480c7af9914..5cc6b3055ff0719979f2bbff9a677eef7cf83cd4 100644 (file)
@@ -69,6 +69,9 @@ class MonPlusieursASSDPanel(MonPlusieursIntoPanel):
               self.listNomsValeurs.append(i.get_name())
 
   def BOkPourListePressed(self):
+        if self.listeValeursCourantes == [] :
+          self.editor.affiche_infos("Pas de Validation d un groupe vide")
+           return
         self.node.item.set_valeur(self.listeValeursCourantes)
        self.editor.affiche_infos("Valeur Acceptée")
        pass
@@ -91,6 +94,7 @@ class MonPlusieursASSDPanel(MonPlusieursIntoPanel):
           
   def Ajout1Valeur(self):
         liste=[]
+        if self.listBoxVal.currentText().latin1() == None : return
         liste.append(self.listBoxVal.currentText().latin1())
         index=self.LBValeurs.currentItem() + 1
         if index==0 : index = -1
index ae0a176bb83dfe12822ec0e25f2d95f63ba740a8..fea6cb71f2ea901930d0bc7f02a302988c39b802 100644 (file)
@@ -45,6 +45,7 @@ class MonPlusieursBasePanel(DPlusBase,QTPanel,SaisieValeur):
         self.politique=PolitiquePlusieurs(node,parent)
         self.BuildLBValeurs()
         self.listeValeursCourantes=self.node.item.GetListeValeurs()
+        self.InitCommentaire()
 
   def ViewDoc(self):
       QTPanel.ViewDoc(self)
@@ -54,6 +55,9 @@ class MonPlusieursBasePanel(DPlusBase,QTPanel,SaisieValeur):
         SaisieValeur.BuildLBValeurs(self)
 
   def BOkPourListePressed(self):
+        if self.listeValeursCourantes == [] :
+           self.editor.affiche_infos("Pas de validation d un groupe vide")
+           return
         self.node.item.set_valeur(self.listeValeursCourantes)
        self.editor.affiche_infos("Valeur Acceptée")
 
@@ -107,3 +111,26 @@ class MonPlusieursBasePanel(DPlusBase,QTPanel,SaisieValeur):
         if fn == "" : return
         from monSelectVal import MonSelectVal
         MonSelectVal(file=fn,parent=self).show()
+
+  def InitCommentaire(self):
+        commentaire=""
+        mc = self.node.item.get_definition()
+        d_aides = { 'TXM' : 'chaînes de caractères',
+                  'R'   : 'réels',
+                  'I'   : 'entiers',
+                  'C'   : 'complexes'}
+        type = mc.type[0]
+        if not d_aides.has_key(type) :
+           if mc.min == mc.max:
+               commentaire="Entrez "+str(mc.min)+" valeurs "
+           else :
+               commentaire="Entrez entre "+str(mc.min)+" et "+str(mc.max)+" valeurs "
+        else :
+           if mc.min == mc.max:
+               commentaire="Entrez "+str(mc.min)+" "+d_aides[type]
+           else :
+               commentaire="Entrez entre "+str(mc.min)+" et  "+str(mc.max) +" " + d_aides[type]
+        aideval=self.node.item.aide()
+        commentaire=commentaire + "\n" + aideval
+        self.Commentaire.setText(QString(commentaire))
+
index fe9aa86294944bf5242f94d7e4af2760df8a1140..80fa423558403d8eb94b44fddb59a8e2b43b122b 100644 (file)
@@ -47,8 +47,12 @@ class MonPlusieursIntoPanel(DPlusInto,QTPanel,SaisieValeur):
         self.listeValeursCourantes=self.node.item.GetListeValeurs()
         SaisieValeur.RemplitPanel(self,self.listeValeursCourantes)
         QObject.connect(self.listBoxVal, SIGNAL("doubleClicked(QListBoxItem*)" ), self.Ajout1Valeur )
+        self.InitCommentaire()
 
   def BOkPourListePressed(self):
+        if self.listeValeursCourantes == [] :
+           self.editor.affiche_infos("Pas de validation d un groupe vide")
+           return
         self.node.item.set_valeur(self.listeValeursCourantes)
        self.editor.affiche_infos("Valeur Acceptée")
 
@@ -71,6 +75,7 @@ class MonPlusieursIntoPanel(DPlusInto,QTPanel,SaisieValeur):
           
   def Ajout1Valeur(self):
         liste=[]
+        if self.listBoxVal.currentText().latin1() == None : return
         liste.append(self.listBoxVal.currentText().latin1())
         index=self.LBValeurs.currentItem() + 1
         if index==0 : index = -1
@@ -90,3 +95,25 @@ class MonPlusieursIntoPanel(DPlusInto,QTPanel,SaisieValeur):
            self.listeValeursCourantes=l1+listeRetour+l3
         SaisieValeur.RemplitPanel(self,self.listeValeursCourantes)
 
+  def InitCommentaire(self):
+        commentaire=""
+        mc = self.node.item.get_definition()
+        d_aides = { 'TXM' : 'chaînes de caractères',
+                  'R'   : 'réels',
+                  'I'   : 'entiers',
+                  'C'   : 'complexes'}
+        type = mc.type[0]
+        if not d_aides.has_key(type) :
+           if mc.min == mc.max:
+               commentaire="Entrez "+str(mc.min)+" valeurs "
+           else :
+               commentaire="Entrez entre "+str(mc.min)+" et "+str(mc.max)+" valeurs "
+        else :
+           if mc.min == mc.max:
+               commentaire="Entrez "+str(mc.min)+" "+d_aides[type]
+           else :
+               commentaire="Entrez entre "+str(mc.min)+" et "+str(mc.max)+" "+d_aides[type]
+        aideval=self.node.item.aide()
+        commentaire=commentaire + "\n" + aideval
+        self.Commentaire.setText(QString(commentaire))
+
index cb202ad6debbd9f8bc8da1e254256d5d2c799fbc..3ba31b20480d4a0c4abbab34b45ba6ba3a2e388c 100644 (file)
@@ -74,6 +74,7 @@ class MonPoursuitePanel(MonMacroPanel):
         if not os.path.isfile(nomFichier) :
            commentaire = "Fichier introuvable"
            self.Commentaire.setText(QString(commentaire))
+           self.editor.affiche_infos(commentaire)
            return
 
         text=self.convert_file(nomFichier)
@@ -91,6 +92,7 @@ class MonPoursuitePanel(MonMacroPanel):
            QMessageBox.critical( self, "Erreur fatale au chargement du fichier Include", l[0])
            commentaire = "Fichier invalide" 
            self.Commentaire.setText(QString(commentaire))
+           self.editor.affiche_infos(commentaire)
            return
 
 
@@ -108,5 +110,6 @@ class MonPoursuitePanel(MonMacroPanel):
        else :
             commentaire = "Impossible de lire le fichier : Format inconnu"
             self.Commentaire.setText(QString(commentaire))
+            self.editor.affiche_infos(commentaire)
        return text
 
index c7c96493376b305448fd36ce274f588f27b07d43..c24f9062bf283ae4277bcf448ef1cb83575ebc06 100644 (file)
@@ -44,6 +44,7 @@ class MonUniqueASSDPanel(DUnASSD,QTPanel,SaisieValeur):
         DUnASSD.__init__(self,parent,name,fl)
         self.politique=PolitiqueUnique(node,parent)
         self.InitListBoxASSD()
+        self.InitCommentaire()
 
   def BOkPressed(self):
         self.ClicASSD()
@@ -54,3 +55,20 @@ class MonUniqueASSDPanel(DUnASSD,QTPanel,SaisieValeur):
   def ViewDoc(self):
       QTPanel.ViewDoc(self)
 
+  def InitCommentaire(self): 
+      mc = self.node.item.get_definition()
+      try :
+          type = mc.type[0].__name__
+      except :
+          type = str(mc.type[0])
+      if len(mc.type)>1 :
+          for typ in mc.type[1:] :
+            try :
+                l=typ.__name__
+            except:
+                l=str(typ)
+            type = type + ' ou '+l
+      commentaire="Un objet de type "+type+" est attendu"
+      aideval=self.node.item.aide()
+      commentaire=commentaire +"\n"+ aideval
+      self.Commentaire.setText(QString(commentaire))
index 30161f97f7781079c6725b44aba748204c775b29..e2bd9c59bad46d40aa9982d87d3c7c8ce17070fd 100644 (file)
@@ -44,6 +44,7 @@ class MonUniqueBasePanel(DUnBase,QTPanel,SaisieValeur):
         DUnBase.__init__(self,parent,name,fl)
         self.politique=PolitiqueUnique(node,parent)
         self.InitLineEditVal()
+        self.InitCommentaire()
 
   def ViewDoc(self):
       QTPanel.ViewDoc(self)
@@ -58,6 +59,17 @@ class MonUniqueBasePanel(DUnBase,QTPanel,SaisieValeur):
                str=QString(valeurTexte)
            self.lineEditVal.setText(str)
 
+  def InitCommentaire(self):
+      mc = self.node.item.get_definition()
+      d_aides = { 'TXM' : "Une chaîne de caractères est attendue",
+                  'R'   : "Un réel est attendu",
+                  'I'   : "Un entier est attendu"}
+      type = mc.type[0]
+      commentaire=d_aides.get(type,"Type de base inconnu")
+      aideval=self.node.item.aide()
+      commentaire=commentaire +"\n"+ aideval
+      self.Commentaire.setText(QString(commentaire))
+
   def BOk2Pressed(self):
         SaisieValeur.BOk2Pressed(self)
 
index 05647db6f96759e39fb0081190d04078223a98d5..46a85338724f36c557edb20ea47bf62d660517b9 100644 (file)
@@ -44,6 +44,7 @@ class MonUniqueCompPanel(DUnComp,QTPanel,PolitiqueUnique):
         DUnComp.__init__(self,parent,name,fl)
         self.politique=PolitiqueUnique(node,parent)
         self.InitLinesVal()
+        self.InitCommentaire()
 
   def InitLinesVal(self):
         valeur=self.node.item.get_valeur()
@@ -147,6 +148,13 @@ class MonUniqueCompPanel(DUnComp,QTPanel,PolitiqueUnique):
           return None
         return v
 
+  def InitCommentaire(self):
+        commentaire='Un complexe est attendu'
+        aideval=self.node.item.aide()
+        commentaire=commentaire +"\n"+ aideval
+        self.Commentaire.setText(QString(commentaire))
+
+
   def BSupPressed(self):
         QTPanel.BSupPressed(self)
 
index 3ec103ca26fbb49cf7d7091ba8c8c2918e80e37a..ff80d41c57834f66d537722f50df593a7b416303 100644 (file)
@@ -91,6 +91,7 @@ class MonUniqueSDCOIntoPanel(DUnSDCOInto,QTPanel,SaisieSDCO):
         else :
           commentaire = self.node.item.get_cr()
           self.reset_old_valeur(anc_val,mess=mess)
+          self.editor.affiche_infos(commentaire)
         self.Commentaire.setText(commentaire)
 
   def LESDCOReturnPressed(self) :
index 0e90aa8e763fe5c0c89cbe33b81affed0729be2d..e94ccf6b18806429c033cec718bec3a735ce0878 100644 (file)
@@ -200,6 +200,7 @@ class QTPanelTBW2(QTPanel):
                  self.LBNouvCommande.insertItem( aCmd)
               self.LBNouvCommande.insertItem( " " )
         QObject.connect( self.LBNouvCommande, SIGNAL("doubleClicked(QListBoxItem*)"),self.DefCmd )
+        QObject.connect( self.LBNouvCommande, SIGNAL("clicked(QListBoxItem*)"),self.DefCmd )
 
   def DefCmd(self):
         if self.LBNouvCommande.selectedItem()== 0 : return
@@ -218,13 +219,19 @@ class QTPanelTBW2(QTPanel):
        if MonItem != None :
           self.LBNouvCommande.setCurrentItem(MonItem)
           self.LBNouvCommande.setSelected(MonItem,1)
+        try :
+           QObject.disconnect(self.LBNouvCommande,SIGNAL("returnPressed(QListBoxItem*)"),self.DefCmd)
+        except :
+           pass
 
   def LEfiltreReturnPressed(self):
         self.DefCmd()
 
   def BNextPressed(self):
-        self.LBNouvCommande.setCurrentItem(self.LBNouvCommande.currentItem()+1)
-        self.LEFiltreTextChanged()
+        MonItem=self.LBNouvCommande.findItem(self.LEFiltre.text().upper(),Qt.Contains)
+        if MonItem != None :
+           self.LBNouvCommande.setCurrentItem(self.LBNouvCommande.currentItem()+1)
+           self.LEFiltreTextChanged()
 
   def LBNouvCommandeClicked(self):
         name=str(self.LBNouvCommande.currentText())
index 65552acf0fb5db36f0970ae5906546f29d2ae52c..93443557c7ae1ba6d58740ee9cd643e5b91ff2bb 100644 (file)
@@ -227,6 +227,13 @@ class Appli(Eficas):
         texte=monEditeur.get_source(file)
         return texte
     
+    def helpAbout(self):
+        import AIDE
+        AIDE.go()
+
+    def NewInclude(self):
+        self.viewmanager.newIncludeEditor()
+
 if __name__=='__main__':
 
     # Modules Eficas
index f9cae0e7c38637a2737b8e41514a65652b91caf0..bc69b4a1e79bdb707c75dcdd70c526d912783870 100644 (file)
@@ -68,14 +68,16 @@ class SaisieValeur:
          self.Commentaire.setText(commentaire)
          valeur=valeurQstring.latin1()
          validite,commentaire=self.politique.RecordValeur(valeur)
-         self.Commentaire.setText(QString(commentaire))
+         #self.Commentaire.setText(QString(commentaire))
+         self.editor.affiche_infos(commentaire)
 
   def ClicValeur(self):
          if self.listBoxVal.selectedItem()== None : return
          valeurQstring=self.listBoxVal.selectedItem().text()
          valeur=valeurQstring.latin1()
          validite,commentaire=self.politique.RecordValeur(valeur)
-         self.Commentaire.setText(QString(commentaire))
+         #self.Commentaire.setText(QString(commentaire))
+         self.editor.affiche_infos(commentaire)
 
   def BOkPressed(self):
          if self.listBoxVal.selectedItem()==None :
@@ -99,7 +101,8 @@ class SaisieValeur:
             nouvelleValeur=valeur
          validite,commentaire=self.politique.RecordValeur(nouvelleValeur)
          if commentaire != "" :
-            self.Commentaire.setText(QString(commentaire))
+            #self.Commentaire.setText(QString(commentaire))
+            self.editor.affiche_infos(commentaire)
 
 
   def TraiteLEValeur(self,valeurTraitee=None) :
index 71e22c22da8c681cd4899f68017b4db7053115ac..53d3f54cbab72fc658036e1da4ed36ecc1eec78a 100644 (file)
@@ -50,5 +50,4 @@ class PopUpMenuNode(PopUpMenuNodePartiel) :
 #-----------------------------------------#
     def createPopUpMenu(self):
         PopUpMenuNodePartiel.createPopUpMenu(self)
-
         self.commentMenu.insertItem( 'ce noeud', self.commentIt )
index fc345e2960fb0457a303fb4e3b9443a3b355dae6..55bbde77a0d5e35b6f62eacd174bd69b2e563219 100644 (file)
@@ -1053,12 +1053,15 @@ class ViewManager:
         else:
             return
         
-    def newEditor(self):
+    def newIncludeEditor(self) :
+        self.newEditor(include=1)
+        
+    def newEditor(self,include=0):
         """
         Public slot to generate a new empty editor.
         """
         from editor import JDCEditor
-        editor = JDCEditor(None,None,self)
+        editor = JDCEditor(None,None,self,include=include)
         
         self.editors.append(editor)
         self.connect(editor, PYSIGNAL('modificationStatusChanged'),
@@ -2440,7 +2443,6 @@ class MyTabview(Tabview):
         @return String name of directory to start or None
         """
         # if we have an active source, return its path
-        print self.activeWindow()
         if self.activeWindow() is not None and \
            self.activeWindow().getFileName():
             return os.path.dirname(self.activeWindow().getFileName())
index 61a79a4ce4d679491a1d88898cda6123a3273147..2948164e803c2b6796499a1169767c9fba88f39c 100644 (file)
@@ -473,7 +473,7 @@ class NoRepeat(ListVal):
           self.cata_info=""
 
       def info(self):
-          return "pas de présence de doublon dans la liste"
+          return "pas de présence de doublon dans la liste"
 
       def info_erreur_liste(self):
           return "Les doublons ne sont pas permis"
index db3fa6bf99d101df684b2cb6ebfa12b11f28db0e..9d8c7399a1ac4f88bd0cec388cf1ac91cb0b078c 100644 (file)
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desFormule.ui'
 #
-# Created: mar mar 4 10:36:38 2008
+# Created: mar mar 4 16:24:30 2008
 #      by: The PyQt User Interface Compiler (pyuic) 3.13
 #
 # WARNING! All changes made in this file will be lost!
@@ -47,69 +47,90 @@ class DFormule(QWidget):
 
         DFormuleLayout = QGridLayout(self,1,1,11,6,"DFormuleLayout")
 
-        self.Commentaire = QLabel(self,"Commentaire")
-
-        DFormuleLayout.addMultiCellWidget(self.Commentaire,1,1,0,2)
+        layout4 = QHBoxLayout(None,0,6,"layout4")
 
-        self.TWChoix = QTabWidget(self,"TWChoix")
+        self.bSup = QPushButton(self,"bSup")
+        self.bSup.setMinimumSize(QSize(0,30))
+        self.bSup.setAutoDefault(1)
+        layout4.addWidget(self.bSup)
 
-        self.Formule = QWidget(self.TWChoix,"Formule")
-        FormuleLayout = QGridLayout(self.Formule,1,1,11,6,"FormuleLayout")
+        self.bOk = QPushButton(self,"bOk")
+        self.bOk.setMinimumSize(QSize(0,30))
+        self.bOk.setAutoDefault(1)
+        self.bOk.setDefault(1)
+        layout4.addWidget(self.bOk)
 
-        self.textLabel1_5 = QLabel(self.Formule,"textLabel1_5")
-        self.textLabel1_5.setMinimumSize(QSize(0,0))
+        self.bHelp = QPushButton(self,"bHelp")
+        self.bHelp.setMinimumSize(QSize(0,30))
+        self.bHelp.setAutoDefault(1)
+        layout4.addWidget(self.bHelp)
 
-        FormuleLayout.addMultiCellWidget(self.textLabel1_5,4,4,0,1)
+        DFormuleLayout.addLayout(layout4,2,0)
 
-        self.LECorpsFormule = QLineEdit(self.Formule,"LECorpsFormule")
+        self.Commentaire = QLabel(self,"Commentaire")
 
-        FormuleLayout.addMultiCellWidget(self.LECorpsFormule,5,5,0,1)
+        DFormuleLayout.addWidget(self.Commentaire,1,0)
 
-        self.textLabel1_2 = QLabel(self.Formule,"textLabel1_2")
+        self.TWChoix = QTabWidget(self,"TWChoix")
 
-        FormuleLayout.addWidget(self.textLabel1_2,0,1)
+        self.Formule = QWidget(self.TWChoix,"Formule")
+        FormuleLayout = QGridLayout(self.Formule,1,1,11,6,"FormuleLayout")
 
         self.textLabel1 = QLabel(self.Formule,"textLabel1")
         self.textLabel1.setMinimumSize(QSize(0,0))
 
         FormuleLayout.addWidget(self.textLabel1,0,0)
 
-        self.textLabel1_3_2 = QLabel(self.Formule,"textLabel1_3_2")
-
-        FormuleLayout.addMultiCellWidget(self.textLabel1_3_2,7,7,0,1)
-
         self.textLabel1_3 = QLabel(self.Formule,"textLabel1_3")
 
         FormuleLayout.addMultiCellWidget(self.textLabel1_3,6,6,0,1)
 
-        self.textLabel2 = QLabel(self.Formule,"textLabel2")
-
-        FormuleLayout.addWidget(self.textLabel2,1,1)
-
         layout6 = QHBoxLayout(None,0,6,"layout6")
 
         self.LENomFormule = QLineEdit(self.Formule,"LENomFormule")
         self.LENomFormule.setMinimumSize(QSize(0,40))
         layout6.addWidget(self.LENomFormule)
 
-        layout4 = QHBoxLayout(None,0,6,"layout4")
+        layout4_2 = QHBoxLayout(None,0,6,"layout4_2")
 
         self.textLabel1_6 = QLabel(self.Formule,"textLabel1_6")
-        layout4.addWidget(self.textLabel1_6)
+        layout4_2.addWidget(self.textLabel1_6)
 
         self.LENomsArgs = QLineEdit(self.Formule,"LENomsArgs")
         self.LENomsArgs.setMinimumSize(QSize(230,40))
-        layout4.addWidget(self.LENomsArgs)
+        layout4_2.addWidget(self.LENomsArgs)
 
         self.textLabel1_6_2 = QLabel(self.Formule,"textLabel1_6_2")
-        layout4.addWidget(self.textLabel1_6_2)
-        layout6.addLayout(layout4)
+        layout4_2.addWidget(self.textLabel1_6_2)
+        layout6.addLayout(layout4_2)
 
         FormuleLayout.addMultiCellLayout(layout6,2,2,0,1)
 
+        self.textLabel2 = QLabel(self.Formule,"textLabel2")
+
+        FormuleLayout.addWidget(self.textLabel2,1,1)
+
+        self.textLabel1_3_2 = QLabel(self.Formule,"textLabel1_3_2")
+
+        FormuleLayout.addMultiCellWidget(self.textLabel1_3_2,7,7,0,1)
+
         self.textLabel2_2 = QLabel(self.Formule,"textLabel2_2")
 
-        FormuleLayout.addWidget(self.textLabel2_2,3,1)
+        FormuleLayout.addMultiCellWidget(self.textLabel2_2,3,3,0,1)
+
+        self.textLabel1_5 = QLabel(self.Formule,"textLabel1_5")
+        self.textLabel1_5.setMinimumSize(QSize(0,0))
+
+        FormuleLayout.addMultiCellWidget(self.textLabel1_5,4,4,0,1)
+
+        self.LECorpsFormule = QLineEdit(self.Formule,"LECorpsFormule")
+        self.LECorpsFormule.setMinimumSize(QSize(0,30))
+
+        FormuleLayout.addMultiCellWidget(self.LECorpsFormule,5,5,0,1)
+
+        self.textLabel1_2 = QLabel(self.Formule,"textLabel1_2")
+
+        FormuleLayout.addWidget(self.textLabel1_2,0,1)
         self.TWChoix.insertTab(self.Formule,QString(""))
 
         self.Commande = QWidget(self.TWChoix,"Commande")
@@ -157,27 +178,11 @@ class DFormule(QWidget):
         CommandeLayout.addMultiCellWidget(self.LBNouvCommande,2,2,0,3)
         self.TWChoix.insertTab(self.Commande,QString(""))
 
-        DFormuleLayout.addMultiCellWidget(self.TWChoix,0,0,0,2)
-
-        self.bSup = QPushButton(self,"bSup")
-        self.bSup.setAutoDefault(1)
-
-        DFormuleLayout.addWidget(self.bSup,2,0)
-
-        self.bOk = QPushButton(self,"bOk")
-        self.bOk.setAutoDefault(1)
-        self.bOk.setDefault(1)
-
-        DFormuleLayout.addWidget(self.bOk,2,1)
-
-        self.bHelp = QPushButton(self,"bHelp")
-        self.bHelp.setAutoDefault(1)
-
-        DFormuleLayout.addWidget(self.bHelp,2,2)
+        DFormuleLayout.addWidget(self.TWChoix,0,0)
 
         self.languageChange()
 
-        self.resize(QSize(529,484).expandedTo(self.minimumSizeHint()))
+        self.resize(QSize(529,493).expandedTo(self.minimumSizeHint()))
         self.clearWState(Qt.WState_Polished)
 
         self.connect(self.LBNouvCommande,SIGNAL("clicked(QListBoxItem*)"),self.LBNouvCommandeClicked)
@@ -196,16 +201,25 @@ class DFormule(QWidget):
 
     def languageChange(self):
         self.setCaption(self.__tr("DMacro"))
+        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.Commentaire.setText(QString.null)
-        self.textLabel1_5.setText(self.__tr("<h3><p align=\"center\"><u><b>Corps de la formule</b></u></p></h3>"))
-        self.textLabel1_2.setText(self.__tr("<h3><p align=\"center\"><u><b>Arguments</b></u></p></h3>"))
         self.textLabel1.setText(self.__tr("<h3><p align=\"center\"><u><b>Nom de la formule</b></u></p></h3>"))
-        self.textLabel1_3_2.setText(self.__trUtf8("\x43\x65\x20\x6e\x27\x65\x73\x74\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\x6c\x65\x20\x62\x6f\x75\x74\x6f\x6e\x20\x56\x61\x6c\x69\x64\x65\x72\x20\x71\x75\x65\x20\x6c\x65\x73\x20\x6e\x6f\x75\x76\x65\x6c\x6c\x65\x73\x0a\x76\x61\x6c\x65\x75\x72\x73\x20\x73\x65\x72\x6f\x6e\x74\x20\x65\x66\x66\x65\x63\x74\x69\x76\x65\x6d\x65\x6e\x74\x20\x70\x72\x69\x73\x65\x73\x20\x65\x6e\x20\x63\x6f\x6d\x70\x74\x65"))
         self.textLabel1_3.setText(self.__trUtf8("\x52\x65\x74\x6f\x75\x72\x2d\x43\x68\x61\x72\x69\x6f\x74\x20\x70\x65\x72\x6d\x65\x74\x20\x64\x65\x20\x76\xc3\xa9\x72\x69\x66\x69\x65\x72\x20\x71\x75\x65\x20\x6c\x27\x65\x78\x70\x72\x65\x73\x73\x69\x6f\x6e\x20\x65\x73\x74\x20\x76\x61\x6c\x69\x64\x65\x2e"))
-        self.textLabel2.setText(self.__trUtf8("\x76\x61\x72\x69\x61\x62\x6c\x65\x73\x20\x73\xc3\xa9\x70\x61\x72\xc3\xa9\x65\x73\x20\x70\x61\x72\x20\x64\x65\x73\x20\x22\x2c\x22\x20\x70\x61\x72\x20\x65\x78\x2e\x20\x3a\x20\x78\x2c\x79\x2c\x7a"))
         self.textLabel1_6.setText(self.__tr("<h1><b>(</b></h1>"))
         self.textLabel1_6_2.setText(self.__tr("<h1><b>)</b></h1>"))
+        self.textLabel2.setText(self.__trUtf8("\x76\x61\x72\x69\x61\x62\x6c\x65\x73\x20\x73\xc3\xa9\x70\x61\x72\xc3\xa9\x65\x73\x20\x70\x61\x72\x20\x64\x65\x73\x20\x22\x2c\x22\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x70\x61\x72\x20\x65\x78\x2e\x20\x3a\x20\x78\x2c\x79\x2c\x7a"))
+        self.textLabel1_3_2.setText(self.__trUtf8("\x43\x65\x20\x6e\x27\x65\x73\x74\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\x6c\x65\x20\x62\x6f\x75\x74\x6f\x6e\x20\x56\x61\x6c\x69\x64\x65\x72\x20\x71\x75\x65\x20\x6c\x65\x73\x20\x6e\x6f\x75\x76\x65\x6c\x6c\x65\x73\x0a\x76\x61\x6c\x65\x75\x72\x73\x20\x73\x65\x72\x6f\x6e\x74\x20\x65\x66\x66\x65\x63\x74\x69\x76\x65\x6d\x65\x6e\x74\x20\x70\x72\x69\x73\x65\x73\x20\x65\x6e\x20\x63\x6f\x6d\x70\x74\x65"))
         self.textLabel2_2.setText(self.__tr("<font size=\"+4\" face=\"Helvetica\"><b>=</b></font>"))
+        self.textLabel1_5.setText(self.__tr("<h3><p align=\"center\"><u><b>Expression</b></u></p></h3>"))
+        self.textLabel1_2.setText(self.__tr("<h3><p align=\"center\"><u><b>Arguments</b></u></p></h3>"))
         self.TWChoix.changeTab(self.Formule,self.__trUtf8("\x44\xc3\xa9\x66\x69\x6e\x69\x74\x69\x6f\x6e\x20\x46\x6f\x72\x6d\x75\x6c\x65"))
         self.textLabel4.setText(self.__trUtf8("\x3c\x70\x20\x61\x6c\x69\x67\x6e\x3d\x22\x6c\x65\x66\x74\x22\x3e\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\x3c\x2f\x70\x3e"))
         self.textLabel1_4.setText(self.__tr("<b><u>Commandes :</u></b>"))
@@ -216,15 +230,6 @@ class DFormule(QWidget):
         QToolTip.add(self.BNext,self.__tr("affiche la prochaine occurence"))
         self.textLabel6.setText(self.__tr("Filtre"))
         self.TWChoix.changeTab(self.Commande,self.__tr("Nouvelle Commande"))
-        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"))
 
 
     def LBNouvCommandeClicked(self):
index 84f92d5608008f30afa01604dc76cbf04b0b09d4..80b9c9b2f959ce4996f2e5b039371a9867e2e086 100644 (file)
@@ -9,7 +9,7 @@
             <x>0</x>
             <y>0</y>
             <width>529</width>
-            <height>484</height>
+            <height>493</height>
         </rect>
     </property>
     <property name="minimumSize">
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLabel" row="1" column="0" rowspan="1" colspan="3">
+        <widget class="QLayoutWidget" row="2" column="0">
+            <property name="name">
+                <cstring>layout4</cstring>
+            </property>
+            <hbox>
+                <property name="name">
+                    <cstring>unnamed</cstring>
+                </property>
+                <widget class="QPushButton">
+                    <property name="name">
+                        <cstring>bSup</cstring>
+                    </property>
+                    <property name="minimumSize">
+                        <size>
+                            <width>0</width>
+                            <height>30</height>
+                        </size>
+                    </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="minimumSize">
+                        <size>
+                            <width>0</width>
+                            <height>30</height>
+                        </size>
+                    </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="minimumSize">
+                        <size>
+                            <width>0</width>
+                            <height>30</height>
+                        </size>
+                    </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>
+            </hbox>
+        </widget>
+        <widget class="QLabel" row="1" column="0">
             <property name="name">
                 <cstring>Commentaire</cstring>
             </property>
                 <string></string>
             </property>
         </widget>
-        <widget class="QTabWidget" row="0" column="0" rowspan="1" colspan="3">
+        <widget class="QTabWidget" row="0" column="0">
             <property name="name">
                 <cstring>TWChoix</cstring>
             </property>
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QLabel" row="4" column="0" rowspan="1" colspan="2">
-                        <property name="name">
-                            <cstring>textLabel1_5</cstring>
-                        </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;Corps de la formule&lt;/b&gt;&lt;/u&gt;&lt;/p&gt;&lt;/h3&gt;</string>
-                        </property>
-                    </widget>
-                    <widget class="QLineEdit" row="5" column="0" rowspan="1" colspan="2">
-                        <property name="name">
-                            <cstring>LECorpsFormule</cstring>
-                        </property>
-                    </widget>
-                    <widget class="QLabel" row="0" column="1">
-                        <property name="name">
-                            <cstring>textLabel1_2</cstring>
-                        </property>
-                        <property name="text">
-                            <string>&lt;h3&gt;&lt;p align="center"&gt;&lt;u&gt;&lt;b&gt;Arguments&lt;/b&gt;&lt;/u&gt;&lt;/p&gt;&lt;/h3&gt;</string>
-                        </property>
-                    </widget>
                     <widget class="QLabel" row="0" column="0">
                         <property name="name">
                             <cstring>textLabel1</cstring>
                             <string>&lt;h3&gt;&lt;p align="center"&gt;&lt;u&gt;&lt;b&gt;Nom de la formule&lt;/b&gt;&lt;/u&gt;&lt;/p&gt;&lt;/h3&gt;</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="7" column="0" rowspan="1" colspan="2">
-                        <property name="name">
-                            <cstring>textLabel1_3_2</cstring>
-                        </property>
-                        <property name="text">
-                            <string>Ce n'est qu'après avoir appuyé sur le bouton Valider que les nouvelles
-valeurs seront effectivement prises en compte</string>
-                        </property>
-                    </widget>
                     <widget class="QLabel" row="6" column="0" rowspan="1" colspan="2">
                         <property name="name">
                             <cstring>textLabel1_3</cstring>
@@ -106,14 +152,6 @@ valeurs seront effectivement prises en compte</string>
                             <string>Retour-Chariot permet de vérifier que l'expression est valide.</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="1" column="1">
-                        <property name="name">
-                            <cstring>textLabel2</cstring>
-                        </property>
-                        <property name="text">
-                            <string>variables séparées par des "," par ex. : x,y,z</string>
-                        </property>
-                    </widget>
                     <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
                         <property name="name">
                             <cstring>layout6</cstring>
@@ -172,7 +210,25 @@ valeurs seront effectivement prises en compte</string>
                             </widget>
                         </hbox>
                     </widget>
-                    <widget class="QLabel" row="3" column="1">
+                    <widget class="QLabel" row="1" column="1">
+                        <property name="name">
+                            <cstring>textLabel2</cstring>
+                        </property>
+                        <property name="text">
+                            <string>variables séparées par des ","
+          par ex. : x,y,z</string>
+                        </property>
+                    </widget>
+                    <widget class="QLabel" row="7" column="0" rowspan="1" colspan="2">
+                        <property name="name">
+                            <cstring>textLabel1_3_2</cstring>
+                        </property>
+                        <property name="text">
+                            <string>Ce n'est qu'après avoir appuyé sur le bouton Valider que les nouvelles
+valeurs seront effectivement prises en compte</string>
+                        </property>
+                    </widget>
+                    <widget class="QLabel" row="3" column="0" rowspan="1" colspan="2">
                         <property name="name">
                             <cstring>textLabel2_2</cstring>
                         </property>
@@ -180,6 +236,39 @@ valeurs seront effectivement prises en compte</string>
                             <string>&lt;font size="+4" face="Helvetica"&gt;&lt;b&gt;=&lt;/b&gt;&lt;/font&gt;</string>
                         </property>
                     </widget>
+                    <widget class="QLabel" row="4" column="0" rowspan="1" colspan="2">
+                        <property name="name">
+                            <cstring>textLabel1_5</cstring>
+                        </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;Expression&lt;/b&gt;&lt;/u&gt;&lt;/p&gt;&lt;/h3&gt;</string>
+                        </property>
+                    </widget>
+                    <widget class="QLineEdit" row="5" column="0" rowspan="1" colspan="2">
+                        <property name="name">
+                            <cstring>LECorpsFormule</cstring>
+                        </property>
+                        <property name="minimumSize">
+                            <size>
+                                <width>0</width>
+                                <height>30</height>
+                            </size>
+                        </property>
+                    </widget>
+                    <widget class="QLabel" row="0" column="1">
+                        <property name="name">
+                            <cstring>textLabel1_2</cstring>
+                        </property>
+                        <property name="text">
+                            <string>&lt;h3&gt;&lt;p align="center"&gt;&lt;u&gt;&lt;b&gt;Arguments&lt;/b&gt;&lt;/u&gt;&lt;/p&gt;&lt;/h3&gt;</string>
+                        </property>
+                    </widget>
                 </grid>
             </widget>
             <widget class="QWidget">
@@ -295,60 +384,6 @@ valeurs seront effectivement prises en compte</string>
                 </grid>
             </widget>
         </widget>
-        <widget class="QPushButton" row="2" column="0">
-            <property name="name">
-                <cstring>bSup</cstring>
-            </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" row="2" column="1">
-            <property name="name">
-                <cstring>bOk</cstring>
-            </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" row="2" column="2">
-            <property name="name">
-                <cstring>bHelp</cstring>
-            </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>
     </grid>
 </widget>
 <images>
index 3760ba9bed46fda2aa53666849d4a4cd50dff0e7..c23a084a97e8f14021e77275536f7eebcfb4588a 100644 (file)
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desPlusieursBase.ui'
 #
-# Created: mar mar 4 10:36:38 2008
+# Created: mar mar 4 17:30:52 2008
 #      by: The PyQt User Interface Compiler (pyuic) 3.13
 #
 # WARNING! All changes made in this file will be lost!
@@ -80,20 +80,6 @@ class DPlusBase(QWidget):
         self.textLabel1 = QLabel(self.Widget8,"textLabel1")
 
         Widget8Layout.addWidget(self.textLabel1,0,0)
-        spacer5 = QSpacerItem(120,20,QSizePolicy.Expanding,QSizePolicy.Minimum)
-        Widget8Layout.addMultiCell(spacer5,4,4,1,2)
-
-        layout6 = QVBoxLayout(None,0,6,"layout6")
-
-        self.bParam = QPushButton(self.Widget8,"bParam")
-        self.bParam.setAutoDefault(1)
-        layout6.addWidget(self.bParam)
-
-        self.bImport = QPushButton(self.Widget8,"bImport")
-        self.bImport.setAutoDefault(1)
-        layout6.addWidget(self.bImport)
-
-        Widget8Layout.addMultiCellLayout(layout6,3,4,3,3)
 
         layout19 = QVBoxLayout(None,0,6,"layout19")
 
@@ -114,9 +100,7 @@ class DPlusBase(QWidget):
 
         self.LBValeurs = QListBox(self.Widget8,"LBValeurs")
 
-        Widget8Layout.addMultiCellWidget(self.LBValeurs,1,4,0,0)
-        spacer3 = QSpacerItem(31,131,QSizePolicy.Minimum,QSizePolicy.Expanding)
-        Widget8Layout.addItem(spacer3,2,3)
+        Widget8Layout.addMultiCellWidget(self.LBValeurs,1,5,0,0)
 
         layout8 = QVBoxLayout(None,0,6,"layout8")
         spacer5_2 = QSpacerItem(20,31,QSizePolicy.Minimum,QSizePolicy.Expanding)
@@ -136,28 +120,50 @@ class DPlusBase(QWidget):
         spacer4 = QSpacerItem(21,231,QSizePolicy.Minimum,QSizePolicy.Expanding)
         layout8.addItem(spacer4)
 
-        Widget8Layout.addMultiCellLayout(layout8,0,3,1,1)
+        Widget8Layout.addMultiCellLayout(layout8,0,4,1,1)
 
         self.Commentaire = QLabel(self.Widget8,"Commentaire")
+        self.Commentaire.setMinimumSize(QSize(0,60))
 
-        Widget8Layout.addMultiCellWidget(self.Commentaire,5,5,0,3)
+        Widget8Layout.addMultiCellWidget(self.Commentaire,2,2,2,3)
 
-        layout7 = QHBoxLayout(None,0,6,"layout7")
+        layout6 = QHBoxLayout(None,0,6,"layout6")
 
         self.bSup = QPushButton(self.Widget8,"bSup")
+        self.bSup.setMinimumSize(QSize(0,30))
         self.bSup.setAutoDefault(1)
-        layout7.addWidget(self.bSup)
+        layout6.addWidget(self.bSup)
 
         self.bOk = QPushButton(self.Widget8,"bOk")
+        self.bOk.setMinimumSize(QSize(0,30))
         self.bOk.setAutoDefault(1)
         self.bOk.setDefault(1)
-        layout7.addWidget(self.bOk)
+        layout6.addWidget(self.bOk)
 
         self.bHelp = QPushButton(self.Widget8,"bHelp")
+        self.bHelp.setMinimumSize(QSize(0,30))
         self.bHelp.setAutoDefault(1)
-        layout7.addWidget(self.bHelp)
+        layout6.addWidget(self.bHelp)
+
+        Widget8Layout.addMultiCellLayout(layout6,6,6,0,3)
+        spacer3 = QSpacerItem(31,130,QSizePolicy.Minimum,QSizePolicy.Expanding)
+        Widget8Layout.addItem(spacer3,3,3)
+        spacer5 = QSpacerItem(160,20,QSizePolicy.Expanding,QSizePolicy.Minimum)
+        Widget8Layout.addMultiCell(spacer5,5,5,1,2)
+
+        layout7 = QVBoxLayout(None,0,6,"layout7")
+
+        self.bParam = QPushButton(self.Widget8,"bParam")
+        self.bParam.setMinimumSize(QSize(0,30))
+        self.bParam.setAutoDefault(1)
+        layout7.addWidget(self.bParam)
+
+        self.bImport = QPushButton(self.Widget8,"bImport")
+        self.bImport.setMinimumSize(QSize(0,30))
+        self.bImport.setAutoDefault(1)
+        layout7.addWidget(self.bImport)
 
-        Widget8Layout.addMultiCellLayout(layout7,6,6,0,3)
+        Widget8Layout.addMultiCellLayout(layout7,4,5,3,3)
         self.tabuniqueinto.insertTab(self.Widget8,QString(""))
 
         DPlusBaseLayout.addWidget(self.tabuniqueinto,0,0)
@@ -180,12 +186,6 @@ class DPlusBase(QWidget):
     def languageChange(self):
         self.setCaption(self.__tr("DUnIn"))
         self.textLabel1.setText(self.__tr("<u><font size=\"+1\">Valeur(s) actuelle(s)</font></u>"))
-        self.bParam.setText(self.__tr("&Parametres"))
-        self.bParam.setAccel(self.__tr("Alt+P"))
-        QToolTip.add(self.bParam,self.__tr("suppression du mot clef"))
-        self.bImport.setText(self.__tr("&Importer"))
-        self.bImport.setAccel(self.__tr("Alt+I"))
-        QToolTip.add(self.bImport,self.__tr("suppression du mot clef"))
         self.textLabel1_2.setText(self.__tr("<font size=\"+1\">Valeur</font>"))
         self.BAjout1Val.setText(QString.null)
         QToolTip.add(self.BAjout1Val,self.__trUtf8("\x61\x6a\x6f\x75\x74\x65\x20\x6c\x61\x20\x76\x61\x6c\x65\x75\x72\x20\x73\x61\x69\x73\x69\x65\x20\x73\x6f\x75\x73\x20\x6c\x20\x6f\x63\x63\x75\x72\x65\x6e\x63\x65\x20\x73\x65\x6c\x65\x63\x74\x69\x6f\x6e\x6e\xc3\xa9\x65\x20\x28\x65\x6e\x20\x66\x69\x6e\x20\x64\x65\x20\x6c\x69\x73\x74\x65\x20\x73\x69\x20\x69\x6c\x20\x6e\x20\x79\x20\x61\x20\x70\x61\x73\x20\x64\x65\x20\x73\x65\x6c\x65\x63\x74\x69\x6f\x6e\x29"))
@@ -201,6 +201,12 @@ class DPlusBase(QWidget):
         self.bHelp.setText(self.__tr("&Documentation"))
         self.bHelp.setAccel(self.__tr("Alt+D"))
         QToolTip.add(self.bHelp,self.__tr("affichage documentation aster"))
+        self.bParam.setText(self.__tr("&Parametres"))
+        self.bParam.setAccel(self.__tr("Alt+P"))
+        QToolTip.add(self.bParam,self.__tr("suppression du mot clef"))
+        self.bImport.setText(self.__tr("&Importer"))
+        self.bImport.setAccel(self.__tr("Alt+I"))
+        QToolTip.add(self.bImport,self.__tr("suppression du mot clef"))
         self.tabuniqueinto.changeTab(self.Widget8,self.__tr("Saisir Valeur"))
 
 
index 5c2578d60d8b077675911e61debc221a139becaf..3a6e13da5827330b3a66596890fc04ddfdaddba2 100644 (file)
                             <string>&lt;u&gt;&lt;font size="+1"&gt;Valeur(s) actuelle(s)&lt;/font&gt;&lt;/u&gt;</string>
                         </property>
                     </widget>
-                    <spacer row="4" column="1" rowspan="1" colspan="2">
-                        <property name="name">
-                            <cstring>spacer5</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Horizontal</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>120</width>
-                                <height>20</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <widget class="QLayoutWidget" row="3" column="3" rowspan="2" colspan="1">
-                        <property name="name">
-                            <cstring>layout6</cstring>
-                        </property>
-                        <vbox>
-                            <property name="name">
-                                <cstring>unnamed</cstring>
-                            </property>
-                            <widget class="QPushButton">
-                                <property name="name">
-                                    <cstring>bParam</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>&amp;Parametres</string>
-                                </property>
-                                <property name="accel">
-                                    <string>Alt+P</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>bImport</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>&amp;Importer</string>
-                                </property>
-                                <property name="accel">
-                                    <string>Alt+I</string>
-                                </property>
-                                <property name="autoDefault">
-                                    <bool>true</bool>
-                                </property>
-                                <property name="toolTip" stdset="0">
-                                    <string>suppression du mot clef</string>
-                                </property>
-                            </widget>
-                        </vbox>
-                    </widget>
                     <widget class="QLayoutWidget" row="1" column="2" rowspan="1" colspan="2">
                         <property name="name">
                             <cstring>layout19</cstring>
                             </widget>
                         </vbox>
                     </widget>
-                    <widget class="QListBox" row="1" column="0" rowspan="4" colspan="1">
+                    <widget class="QListBox" row="1" column="0" rowspan="5" colspan="1">
                         <property name="name">
                             <cstring>LBValeurs</cstring>
                         </property>
                     </widget>
-                    <spacer row="2" column="3">
-                        <property name="name">
-                            <cstring>spacer3</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Vertical</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>31</width>
-                                <height>131</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <widget class="QLayoutWidget" row="0" column="1" rowspan="4" colspan="1">
+                    <widget class="QLayoutWidget" row="0" column="1" rowspan="5" colspan="1">
                         <property name="name">
                             <cstring>layout8</cstring>
                         </property>
                             </spacer>
                         </vbox>
                     </widget>
-                    <widget class="QLabel" row="5" column="0" rowspan="1" colspan="4">
+                    <widget class="QLabel" row="2" column="2" rowspan="1" colspan="2">
                         <property name="name">
                             <cstring>Commentaire</cstring>
                         </property>
+                        <property name="minimumSize">
+                            <size>
+                                <width>0</width>
+                                <height>60</height>
+                            </size>
+                        </property>
                         <property name="text">
                             <string></string>
                         </property>
                     </widget>
                     <widget class="QLayoutWidget" row="6" column="0" rowspan="1" colspan="4">
                         <property name="name">
-                            <cstring>layout7</cstring>
+                            <cstring>layout6</cstring>
                         </property>
                         <hbox>
                             <property name="name">
                                 <property name="name">
                                     <cstring>bSup</cstring>
                                 </property>
+                                <property name="minimumSize">
+                                    <size>
+                                        <width>0</width>
+                                        <height>30</height>
+                                    </size>
+                                </property>
                                 <property name="text">
                                     <string>&amp;Supprimer</string>
                                 </property>
                                 <property name="name">
                                     <cstring>bOk</cstring>
                                 </property>
+                                <property name="minimumSize">
+                                    <size>
+                                        <width>0</width>
+                                        <height>30</height>
+                                    </size>
+                                </property>
                                 <property name="text">
                                     <string>&amp;Valider</string>
                                 </property>
                                 <property name="name">
                                     <cstring>bHelp</cstring>
                                 </property>
+                                <property name="minimumSize">
+                                    <size>
+                                        <width>0</width>
+                                        <height>30</height>
+                                    </size>
+                                </property>
                                 <property name="text">
                                     <string>&amp;Documentation</string>
                                 </property>
                             </widget>
                         </hbox>
                     </widget>
+                    <spacer row="3" column="3">
+                        <property name="name">
+                            <cstring>spacer3</cstring>
+                        </property>
+                        <property name="orientation">
+                            <enum>Vertical</enum>
+                        </property>
+                        <property name="sizeType">
+                            <enum>Expanding</enum>
+                        </property>
+                        <property name="sizeHint">
+                            <size>
+                                <width>31</width>
+                                <height>130</height>
+                            </size>
+                        </property>
+                    </spacer>
+                    <spacer row="5" column="1" rowspan="1" colspan="2">
+                        <property name="name">
+                            <cstring>spacer5</cstring>
+                        </property>
+                        <property name="orientation">
+                            <enum>Horizontal</enum>
+                        </property>
+                        <property name="sizeType">
+                            <enum>Expanding</enum>
+                        </property>
+                        <property name="sizeHint">
+                            <size>
+                                <width>160</width>
+                                <height>20</height>
+                            </size>
+                        </property>
+                    </spacer>
+                    <widget class="QLayoutWidget" row="4" column="3" rowspan="2" colspan="1">
+                        <property name="name">
+                            <cstring>layout7</cstring>
+                        </property>
+                        <vbox>
+                            <property name="name">
+                                <cstring>unnamed</cstring>
+                            </property>
+                            <widget class="QPushButton">
+                                <property name="name">
+                                    <cstring>bParam</cstring>
+                                </property>
+                                <property name="minimumSize">
+                                    <size>
+                                        <width>0</width>
+                                        <height>30</height>
+                                    </size>
+                                </property>
+                                <property name="text">
+                                    <string>&amp;Parametres</string>
+                                </property>
+                                <property name="accel">
+                                    <string>Alt+P</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>bImport</cstring>
+                                </property>
+                                <property name="minimumSize">
+                                    <size>
+                                        <width>0</width>
+                                        <height>30</height>
+                                    </size>
+                                </property>
+                                <property name="text">
+                                    <string>&amp;Importer</string>
+                                </property>
+                                <property name="accel">
+                                    <string>Alt+I</string>
+                                </property>
+                                <property name="autoDefault">
+                                    <bool>true</bool>
+                                </property>
+                                <property name="toolTip" stdset="0">
+                                    <string>suppression du mot clef</string>
+                                </property>
+                            </widget>
+                        </vbox>
+                    </widget>
                 </grid>
             </widget>
         </widget>
index c1aa71a62e977dafe57285bfe67c303a2cb2dfec..de60fae6cb5578936ee6bdd760ea6640a20b8794 100644 (file)
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desPlusieursInto.ui'
 #
-# Created: mar mar 4 10:36:38 2008
+# Created: mar mar 4 16:38:40 2008
 #      by: The PyQt User Interface Compiler (pyuic) 3.13
 #
 # WARNING! All changes made in this file will be lost!
@@ -77,25 +77,21 @@ class DPlusInto(QWidget):
         self.Widget8 = QWidget(self.tabuniqueinto,"Widget8")
         Widget8Layout = QGridLayout(self.Widget8,1,1,11,6,"Widget8Layout")
 
-        self.Commentaire = QLabel(self.Widget8,"Commentaire")
-
-        Widget8Layout.addMultiCellWidget(self.Commentaire,2,2,0,3)
-
         self.textLabel1 = QLabel(self.Widget8,"textLabel1")
 
-        Widget8Layout.addMultiCellWidget(self.textLabel1,0,0,0,1)
+        Widget8Layout.addMultiCellWidget(self.textLabel1,0,0,0,2)
 
-        self.LBValeurs = QListBox(self.Widget8,"LBValeurs")
+        self.textLabel1_2 = QLabel(self.Widget8,"textLabel1_2")
 
-        Widget8Layout.addWidget(self.LBValeurs,1,0)
+        Widget8Layout.addMultiCellWidget(self.textLabel1_2,0,0,3,5)
 
         self.listBoxVal = QListBox(self.Widget8,"listBoxVal")
 
-        Widget8Layout.addWidget(self.listBoxVal,1,3)
+        Widget8Layout.addMultiCellWidget(self.listBoxVal,1,1,4,5)
 
-        self.textLabel1_2 = QLabel(self.Widget8,"textLabel1_2")
+        self.LBValeurs = QListBox(self.Widget8,"LBValeurs")
 
-        Widget8Layout.addMultiCellWidget(self.textLabel1_2,0,0,2,3)
+        Widget8Layout.addMultiCellWidget(self.LBValeurs,1,1,0,1)
 
         layout3 = QVBoxLayout(None,0,6,"layout3")
         spacer2 = QSpacerItem(21,50,QSizePolicy.Minimum,QSizePolicy.Expanding)
@@ -115,24 +111,31 @@ class DPlusInto(QWidget):
         spacer3 = QSpacerItem(21,181,QSizePolicy.Minimum,QSizePolicy.Expanding)
         layout3.addItem(spacer3)
 
-        Widget8Layout.addMultiCellLayout(layout3,1,1,1,2)
+        Widget8Layout.addMultiCellLayout(layout3,1,1,2,3)
 
-        layout3_2 = QHBoxLayout(None,0,6,"layout3_2")
+        self.bHelp = QPushButton(self.Widget8,"bHelp")
+        self.bHelp.setMinimumSize(QSize(0,30))
+        self.bHelp.setAutoDefault(1)
 
-        self.bSup = QPushButton(self.Widget8,"bSup")
-        self.bSup.setAutoDefault(1)
-        layout3_2.addWidget(self.bSup)
+        Widget8Layout.addWidget(self.bHelp,3,5)
 
         self.bOk = QPushButton(self.Widget8,"bOk")
+        self.bOk.setMinimumSize(QSize(0,30))
         self.bOk.setAutoDefault(1)
         self.bOk.setDefault(1)
-        layout3_2.addWidget(self.bOk)
 
-        self.bHelp = QPushButton(self.Widget8,"bHelp")
-        self.bHelp.setAutoDefault(1)
-        layout3_2.addWidget(self.bHelp)
+        Widget8Layout.addMultiCellWidget(self.bOk,3,3,1,4)
+
+        self.bSup = QPushButton(self.Widget8,"bSup")
+        self.bSup.setMinimumSize(QSize(0,30))
+        self.bSup.setAutoDefault(1)
+
+        Widget8Layout.addWidget(self.bSup,3,0)
 
-        Widget8Layout.addMultiCellLayout(layout3_2,3,3,0,3)
+        self.Commentaire = QLabel(self.Widget8,"Commentaire")
+        self.Commentaire.setMinimumSize(QSize(0,40))
+
+        Widget8Layout.addMultiCellWidget(self.Commentaire,2,2,0,5)
         self.tabuniqueinto.insertTab(self.Widget8,QString(""))
 
         DPlusIntoLayout.addWidget(self.tabuniqueinto,0,0)
@@ -152,22 +155,22 @@ class DPlusInto(QWidget):
 
     def languageChange(self):
         self.setCaption(self.__tr("DUnIn"))
-        self.Commentaire.setText(QString.null)
         self.textLabel1.setText(self.__tr("<u><font size=\"+1\">Valeur(s) actuelle(s)</font></u>"))
         self.textLabel1_2.setText(self.__tr("<u><font size=\"+1\">Valeur(s) possibles(s)</font></u>"))
         self.BSup1Val.setText(QString.null)
         QToolTip.add(self.BSup1Val,self.__tr("enleve l occurence selectionnee"))
         self.BAjout1Val.setText(QString.null)
         QToolTip.add(self.BAjout1Val,self.__trUtf8("\x61\x6a\x6f\x75\x74\x65\x20\x6c\x61\x20\x76\x61\x6c\x65\x75\x72\x20\x73\x61\x69\x73\x69\x65\x20\x73\x6f\x75\x73\x20\x6c\x20\x6f\x63\x63\x75\x72\x65\x6e\x63\x65\x20\x73\x65\x6c\x65\x63\x74\x69\x6f\x6e\x6e\xc3\xa9\x65\x20\x28\x65\x6e\x20\x66\x69\x6e\x20\x64\x65\x20\x6c\x69\x73\x74\x65\x20\x73\x69\x20\x69\x6c\x20\x6e\x20\x79\x20\x61\x20\x70\x61\x73\x20\x64\x65\x20\x73\x65\x6c\x65\x63\x74\x69\x6f\x6e\x29"))
-        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.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.bSup.setText(self.__tr("&Supprimer"))
+        self.bSup.setAccel(self.__tr("Alt+S"))
+        QToolTip.add(self.bSup,self.__tr("suppression du mot clef"))
+        self.Commentaire.setText(QString.null)
         self.tabuniqueinto.changeTab(self.Widget8,self.__tr("Saisir Valeur"))
 
 
index 4aca5cb10a696c105f91c70860c25204d400adcf..e47a5b5aa498089f72800bb7d9d93d08e350ede2 100644 (file)
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QLabel" row="2" column="0" rowspan="1" colspan="4">
-                        <property name="name">
-                            <cstring>Commentaire</cstring>
-                        </property>
-                        <property name="text">
-                            <string></string>
-                        </property>
-                    </widget>
-                    <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
+                    <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3">
                         <property name="name">
                             <cstring>textLabel1</cstring>
                         </property>
                             <string>&lt;u&gt;&lt;font size="+1"&gt;Valeur(s) actuelle(s)&lt;/font&gt;&lt;/u&gt;</string>
                         </property>
                     </widget>
-                    <widget class="QListBox" row="1" column="0">
+                    <widget class="QLabel" row="0" column="3" rowspan="1" colspan="3">
                         <property name="name">
-                            <cstring>LBValeurs</cstring>
+                            <cstring>textLabel1_2</cstring>
+                        </property>
+                        <property name="text">
+                            <string>&lt;u&gt;&lt;font size="+1"&gt;Valeur(s) possibles(s)&lt;/font&gt;&lt;/u&gt;</string>
                         </property>
                     </widget>
-                    <widget class="QListBox" row="1" column="3">
+                    <widget class="QListBox" row="1" column="4" rowspan="1" colspan="2">
                         <property name="name">
                             <cstring>listBoxVal</cstring>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="0" column="2" rowspan="1" colspan="2">
+                    <widget class="QListBox" row="1" column="0" rowspan="1" colspan="2">
                         <property name="name">
-                            <cstring>textLabel1_2</cstring>
-                        </property>
-                        <property name="text">
-                            <string>&lt;u&gt;&lt;font size="+1"&gt;Valeur(s) possibles(s)&lt;/font&gt;&lt;/u&gt;</string>
+                            <cstring>LBValeurs</cstring>
                         </property>
                     </widget>
-                    <widget class="QLayoutWidget" row="1" column="1" rowspan="1" colspan="2">
+                    <widget class="QLayoutWidget" row="1" column="2" rowspan="1" colspan="2">
                         <property name="name">
                             <cstring>layout3</cstring>
                         </property>
                             </spacer>
                         </vbox>
                     </widget>
-                    <widget class="QLayoutWidget" row="3" column="0" rowspan="1" colspan="4">
+                    <widget class="QPushButton" row="3" column="5">
                         <property name="name">
-                            <cstring>layout3</cstring>
+                            <cstring>bHelp</cstring>
+                        </property>
+                        <property name="minimumSize">
+                            <size>
+                                <width>0</width>
+                                <height>30</height>
+                            </size>
+                        </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="QPushButton" row="3" column="1" rowspan="1" colspan="4">
+                        <property name="name">
+                            <cstring>bOk</cstring>
+                        </property>
+                        <property name="minimumSize">
+                            <size>
+                                <width>0</width>
+                                <height>30</height>
+                            </size>
+                        </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" row="3" column="0">
+                        <property name="name">
+                            <cstring>bSup</cstring>
+                        </property>
+                        <property name="minimumSize">
+                            <size>
+                                <width>0</width>
+                                <height>30</height>
+                            </size>
+                        </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="QLabel" row="2" column="0" rowspan="1" colspan="6">
+                        <property name="name">
+                            <cstring>Commentaire</cstring>
+                        </property>
+                        <property name="minimumSize">
+                            <size>
+                                <width>0</width>
+                                <height>40</height>
+                            </size>
+                        </property>
+                        <property name="text">
+                            <string></string>
                         </property>
-                        <hbox>
-                            <property name="name">
-                                <cstring>unnamed</cstring>
-                            </property>
-                            <widget class="QPushButton">
-                                <property name="name">
-                                    <cstring>bSup</cstring>
-                                </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="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="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>
-                        </hbox>
                     </widget>
                 </grid>
             </widget>
index 0aeeac58f00f49a7047364c37adb03f60f1a0209..766f34f4fa4c36cff1dab2ef5c13150c130372ba 100644 (file)
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desUniqueASSD.ui'
 #
-# Created: mar mar 4 10:36:39 2008
+# Created: mar mar 4 16:27:19 2008
 #      by: The PyQt User Interface Compiler (pyuic) 3.13
 #
 # WARNING! All changes made in this file will be lost!
@@ -25,34 +25,41 @@ class DUnASSD(QWidget):
         self.tabuniqueinto = QTabWidget(self,"tabuniqueinto")
 
         self.Widget8 = QWidget(self.tabuniqueinto,"Widget8")
-
-        self.listBoxASSD = QListBox(self.Widget8,"listBoxASSD")
-        self.listBoxASSD.setGeometry(QRect(11,67,436,287))
+        Widget8Layout = QGridLayout(self.Widget8,1,1,11,6,"Widget8Layout")
 
         self.textLabel2 = QLabel(self.Widget8,"textLabel2")
-        self.textLabel2.setGeometry(QRect(11,11,436,50))
         self.textLabel2.setMinimumSize(QSize(436,50))
 
-        LayoutWidget = QWidget(self.Widget8,"layout2")
-        LayoutWidget.setGeometry(QRect(10,400,440,23))
-        layout2 = QHBoxLayout(LayoutWidget,11,6,"layout2")
+        Widget8Layout.addWidget(self.textLabel2,0,0)
+
+        self.listBoxASSD = QListBox(self.Widget8,"listBoxASSD")
+
+        Widget8Layout.addWidget(self.listBoxASSD,1,0)
+
+        self.Commentaire = QLabel(self.Widget8,"Commentaire")
+        self.Commentaire.setMinimumSize(QSize(380,30))
+
+        Widget8Layout.addWidget(self.Commentaire,2,0)
 
-        self.bSup = QPushButton(LayoutWidget,"bSup")
+        layout2 = QHBoxLayout(None,0,6,"layout2")
+
+        self.bSup = QPushButton(self.Widget8,"bSup")
+        self.bSup.setMinimumSize(QSize(0,30))
         self.bSup.setAutoDefault(1)
         layout2.addWidget(self.bSup)
 
-        self.bOk = QPushButton(LayoutWidget,"bOk")
+        self.bOk = QPushButton(self.Widget8,"bOk")
+        self.bOk.setMinimumSize(QSize(0,30))
         self.bOk.setAutoDefault(1)
         self.bOk.setDefault(1)
         layout2.addWidget(self.bOk)
 
-        self.bHelp = QPushButton(LayoutWidget,"bHelp")
+        self.bHelp = QPushButton(self.Widget8,"bHelp")
+        self.bHelp.setMinimumSize(QSize(0,30))
         self.bHelp.setAutoDefault(1)
         layout2.addWidget(self.bHelp)
 
-        self.Commentaire = QLabel(self.Widget8,"Commentaire")
-        self.Commentaire.setGeometry(QRect(11,360,436,30))
-        self.Commentaire.setMinimumSize(QSize(380,30))
+        Widget8Layout.addLayout(layout2,3,0)
         self.tabuniqueinto.insertTab(self.Widget8,QString(""))
 
         DUnASSDLayout.addWidget(self.tabuniqueinto,0,0)
@@ -70,6 +77,7 @@ class DUnASSD(QWidget):
     def languageChange(self):
         self.setCaption(self.__tr("DUnIn"))
         self.textLabel2.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\x53\x74\x72\x75\x63\x74\x75\x72\x65\x73\x20\x64\x65\x20\x64\x6f\x6e\x6e\xc3\xa9\x65\x73\x20\x64\x75\x20\x74\x79\x70\x65\x0a\x72\x65\x71\x75\x69\x73\x20\x70\x61\x72\x20\x6c\x27\x6f\x62\x6a\x65\x74\x20\x63\x6f\x75\x72\x61\x6e\x74\x20\x3a\x3c\x2f\x70\x3e\x3c\x2f\x66\x6f\x6e\x74\x3e"))
+        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"))
@@ -79,7 +87,6 @@ class DUnASSD(QWidget):
         self.bHelp.setText(self.__tr("&Documentation"))
         self.bHelp.setAccel(self.__tr("Alt+D"))
         QToolTip.add(self.bHelp,self.__tr("affichage documentation aster"))
-        self.Commentaire.setText(QString.null)
         self.tabuniqueinto.changeTab(self.Widget8,self.__tr("Saisir Valeur"))
 
 
index 0b18675543b7ab0f1723cb8e0d99ae46c76ed22e..819c9294c381f360608ae0dfdd7c84f0c52021a0 100644 (file)
                 <attribute name="title">
                     <string>Saisir Valeur</string>
                 </attribute>
-                <widget class="QListBox">
+                <grid>
                     <property name="name">
-                        <cstring>listBoxASSD</cstring>
+                        <cstring>unnamed</cstring>
                     </property>
-                    <property name="geometry">
-                        <rect>
-                            <x>11</x>
-                            <y>67</y>
-                            <width>436</width>
-                            <height>287</height>
-                        </rect>
-                    </property>
-                </widget>
-                <widget class="QLabel">
-                    <property name="name">
-                        <cstring>textLabel2</cstring>
-                    </property>
-                    <property name="geometry">
-                        <rect>
-                            <x>11</x>
-                            <y>11</y>
-                            <width>436</width>
-                            <height>50</height>
-                        </rect>
-                    </property>
-                    <property name="minimumSize">
-                        <size>
-                            <width>436</width>
-                            <height>50</height>
-                        </size>
-                    </property>
-                    <property name="text">
-                        <string>&lt;font size="+1"&gt;&lt;p align="center"&gt;Structures de données du type
+                    <widget class="QLabel" row="0" column="0">
+                        <property name="name">
+                            <cstring>textLabel2</cstring>
+                        </property>
+                        <property name="minimumSize">
+                            <size>
+                                <width>436</width>
+                                <height>50</height>
+                            </size>
+                        </property>
+                        <property name="text">
+                            <string>&lt;font size="+1"&gt;&lt;p align="center"&gt;Structures de données du type
 requis par l'objet courant :&lt;/p&gt;&lt;/font&gt;</string>
-                    </property>
-                </widget>
-                <widget class="QLayoutWidget">
-                    <property name="name">
-                        <cstring>layout2</cstring>
-                    </property>
-                    <property name="geometry">
-                        <rect>
-                            <x>10</x>
-                            <y>400</y>
-                            <width>440</width>
-                            <height>23</height>
-                        </rect>
-                    </property>
-                    <hbox>
+                        </property>
+                    </widget>
+                    <widget class="QListBox" row="1" column="0">
                         <property name="name">
-                            <cstring>unnamed</cstring>
+                            <cstring>listBoxASSD</cstring>
                         </property>
-                        <widget class="QPushButton">
-                            <property name="name">
-                                <cstring>bSup</cstring>
-                            </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="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">
+                    </widget>
+                    <widget class="QLabel" row="2" column="0">
+                        <property name="name">
+                            <cstring>Commentaire</cstring>
+                        </property>
+                        <property name="minimumSize">
+                            <size>
+                                <width>380</width>
+                                <height>30</height>
+                            </size>
+                        </property>
+                        <property name="text">
+                            <string></string>
+                        </property>
+                    </widget>
+                    <widget class="QLayoutWidget" row="3" column="0">
+                        <property name="name">
+                            <cstring>layout2</cstring>
+                        </property>
+                        <hbox>
                             <property name="name">
-                                <cstring>bHelp</cstring>
-                            </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>
-                    </hbox>
-                </widget>
-                <widget class="QLabel">
-                    <property name="name">
-                        <cstring>Commentaire</cstring>
-                    </property>
-                    <property name="geometry">
-                        <rect>
-                            <x>11</x>
-                            <y>360</y>
-                            <width>436</width>
-                            <height>30</height>
-                        </rect>
-                    </property>
-                    <property name="minimumSize">
-                        <size>
-                            <width>380</width>
-                            <height>30</height>
-                        </size>
-                    </property>
-                    <property name="text">
-                        <string></string>
-                    </property>
-                </widget>
+                                <cstring>unnamed</cstring>
+                            </property>
+                            <widget class="QPushButton">
+                                <property name="name">
+                                    <cstring>bSup</cstring>
+                                </property>
+                                <property name="minimumSize">
+                                    <size>
+                                        <width>0</width>
+                                        <height>30</height>
+                                    </size>
+                                </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="minimumSize">
+                                    <size>
+                                        <width>0</width>
+                                        <height>30</height>
+                                    </size>
+                                </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="minimumSize">
+                                    <size>
+                                        <width>0</width>
+                                        <height>30</height>
+                                    </size>
+                                </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>
+                        </hbox>
+                    </widget>
+                </grid>
             </widget>
         </widget>
     </grid>
index edcb5505d626f79f0544b6bad6c14c5b860ee346..89e76db51773b9ac61082da1baea044404ef6682 100644 (file)
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desUniqueBase.ui'
 #
-# Created: mar mar 4 10:36:39 2008
+# Created: mar mar 4 16:20:27 2008
 #      by: The PyQt User Interface Compiler (pyuic) 3.13
 #
 # WARNING! All changes made in this file will be lost!
@@ -25,49 +25,54 @@ class DUnBase(QWidget):
         self.tabuniqueinto = QTabWidget(self,"tabuniqueinto")
 
         self.Widget8 = QWidget(self.tabuniqueinto,"Widget8")
+        Widget8Layout = QGridLayout(self.Widget8,1,1,11,6,"Widget8Layout")
 
-        self.Commentaire = QLabel(self.Widget8,"Commentaire")
-        self.Commentaire.setGeometry(QRect(11,350,434,40))
-        self.Commentaire.setMinimumSize(QSize(430,40))
-
-        LayoutWidget = QWidget(self.Widget8,"layout2")
-        LayoutWidget.setGeometry(QRect(11,171,434,52))
-        layout2 = QHBoxLayout(LayoutWidget,11,6,"layout2")
+        layout2 = QHBoxLayout(None,0,6,"layout2")
 
-        self.textLabel2 = QLabel(LayoutWidget,"textLabel2")
+        self.textLabel2 = QLabel(self.Widget8,"textLabel2")
         layout2.addWidget(self.textLabel2)
 
-        self.lineEditVal = QLineEdit(LayoutWidget,"lineEditVal")
+        self.lineEditVal = QLineEdit(self.Widget8,"lineEditVal")
         self.lineEditVal.setMinimumSize(QSize(290,50))
         layout2.addWidget(self.lineEditVal)
 
-        LayoutWidget_2 = QWidget(self.Widget8,"layout3")
-        LayoutWidget_2.setGeometry(QRect(11,11,434,32))
-        layout3 = QHBoxLayout(LayoutWidget_2,11,6,"layout3")
-        spacer1 = QSpacerItem(281,21,QSizePolicy.Expanding,QSizePolicy.Minimum)
-        layout3.addItem(spacer1)
+        Widget8Layout.addMultiCellLayout(layout2,1,1,0,2)
+        spacer1 = QSpacerItem(286,21,QSizePolicy.Expanding,QSizePolicy.Minimum)
+        Widget8Layout.addMultiCell(spacer1,0,0,0,1)
 
-        self.bParametres = QPushButton(LayoutWidget_2,"bParametres")
+        self.bParametres = QPushButton(self.Widget8,"bParametres")
         self.bParametres.setSizePolicy(QSizePolicy(0,0,0,0,self.bParametres.sizePolicy().hasHeightForWidth()))
         self.bParametres.setMinimumSize(QSize(140,30))
-        layout3.addWidget(self.bParametres)
 
-        LayoutWidget_3 = QWidget(self.Widget8,"layout4")
-        LayoutWidget_3.setGeometry(QRect(10,400,440,23))
-        layout4 = QHBoxLayout(LayoutWidget_3,11,6,"layout4")
+        Widget8Layout.addWidget(self.bParametres,0,2)
 
-        self.bSup = QPushButton(LayoutWidget_3,"bSup")
+        self.bSup = QPushButton(self.Widget8,"bSup")
+        self.bSup.setMinimumSize(QSize(0,30))
         self.bSup.setAutoDefault(1)
-        layout4.addWidget(self.bSup)
 
-        self.bOk = QPushButton(LayoutWidget_3,"bOk")
+        Widget8Layout.addWidget(self.bSup,5,0)
+
+        self.bOk = QPushButton(self.Widget8,"bOk")
+        self.bOk.setMinimumSize(QSize(0,30))
         self.bOk.setAutoDefault(1)
         self.bOk.setDefault(1)
-        layout4.addWidget(self.bOk)
 
-        self.bHelp = QPushButton(LayoutWidget_3,"bHelp")
+        Widget8Layout.addWidget(self.bOk,5,1)
+
+        self.bHelp = QPushButton(self.Widget8,"bHelp")
+        self.bHelp.setMinimumSize(QSize(0,30))
         self.bHelp.setAutoDefault(1)
-        layout4.addWidget(self.bHelp)
+
+        Widget8Layout.addWidget(self.bHelp,5,2)
+        spacer4 = QSpacerItem(41,110,QSizePolicy.Minimum,QSizePolicy.Expanding)
+        Widget8Layout.addItem(spacer4,2,1)
+        spacer3 = QSpacerItem(21,111,QSizePolicy.Minimum,QSizePolicy.Expanding)
+        Widget8Layout.addItem(spacer3,4,1)
+
+        self.Commentaire = QLabel(self.Widget8,"Commentaire")
+        self.Commentaire.setMinimumSize(QSize(430,40))
+
+        Widget8Layout.addMultiCellWidget(self.Commentaire,3,3,0,2)
         self.tabuniqueinto.insertTab(self.Widget8,QString(""))
 
         DUnBaseLayout.addWidget(self.tabuniqueinto,0,0)
@@ -86,7 +91,6 @@ class DUnBase(QWidget):
 
     def languageChange(self):
         self.setCaption(self.__tr("DUnIn"))
-        self.Commentaire.setText(QString.null)
         self.textLabel2.setText(self.__tr("<b><u><p align=\"center\">Valeur: </p></u></b>"))
         self.bParametres.setText(self.__tr("Parametres"))
         self.bSup.setText(self.__tr("&Supprimer"))
@@ -98,6 +102,7 @@ class DUnBase(QWidget):
         self.bHelp.setText(self.__tr("&Documentation"))
         self.bHelp.setAccel(self.__tr("Alt+D"))
         QToolTip.add(self.bHelp,self.__tr("affichage documentation aster"))
+        self.Commentaire.setText(QString.null)
         self.tabuniqueinto.changeTab(self.Widget8,self.__tr("Saisir Valeur"))
 
 
index 2188b31b2bf92685937fcd89f373ad2d879c5772..6c5eb31881280e99b1b4947b6d0e34f3736fd81b 100644 (file)
                 <attribute name="title">
                     <string>Saisir Valeur</string>
                 </attribute>
-                <widget class="QLabel">
+                <grid>
                     <property name="name">
-                        <cstring>Commentaire</cstring>
+                        <cstring>unnamed</cstring>
                     </property>
-                    <property name="geometry">
-                        <rect>
-                            <x>11</x>
-                            <y>350</y>
-                            <width>434</width>
-                            <height>40</height>
-                        </rect>
-                    </property>
-                    <property name="minimumSize">
-                        <size>
-                            <width>430</width>
-                            <height>40</height>
-                        </size>
-                    </property>
-                    <property name="text">
-                        <string></string>
-                    </property>
-                </widget>
-                <widget class="QLayoutWidget">
-                    <property name="name">
-                        <cstring>layout2</cstring>
-                    </property>
-                    <property name="geometry">
-                        <rect>
-                            <x>11</x>
-                            <y>171</y>
-                            <width>434</width>
-                            <height>52</height>
-                        </rect>
-                    </property>
-                    <hbox>
+                    <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="3">
                         <property name="name">
-                            <cstring>unnamed</cstring>
+                            <cstring>layout2</cstring>
                         </property>
-                        <widget class="QLabel">
+                        <hbox>
                             <property name="name">
-                                <cstring>textLabel2</cstring>
-                            </property>
-                            <property name="text">
-                                <string>&lt;b&gt;&lt;u&gt;&lt;p align="center"&gt;Valeur: &lt;/p&gt;&lt;/u&gt;&lt;/b&gt;</string>
+                                <cstring>unnamed</cstring>
                             </property>
-                        </widget>
-                        <widget class="QLineEdit">
-                            <property name="name">
-                                <cstring>lineEditVal</cstring>
-                            </property>
-                            <property name="minimumSize">
-                                <size>
-                                    <width>290</width>
-                                    <height>50</height>
-                                </size>
-                            </property>
-                        </widget>
-                    </hbox>
-                </widget>
-                <widget class="QLayoutWidget">
-                    <property name="name">
-                        <cstring>layout3</cstring>
-                    </property>
-                    <property name="geometry">
-                        <rect>
-                            <x>11</x>
-                            <y>11</y>
-                            <width>434</width>
-                            <height>32</height>
-                        </rect>
-                    </property>
-                    <hbox>
+                            <widget class="QLabel">
+                                <property name="name">
+                                    <cstring>textLabel2</cstring>
+                                </property>
+                                <property name="text">
+                                    <string>&lt;b&gt;&lt;u&gt;&lt;p align="center"&gt;Valeur: &lt;/p&gt;&lt;/u&gt;&lt;/b&gt;</string>
+                                </property>
+                            </widget>
+                            <widget class="QLineEdit">
+                                <property name="name">
+                                    <cstring>lineEditVal</cstring>
+                                </property>
+                                <property name="minimumSize">
+                                    <size>
+                                        <width>290</width>
+                                        <height>50</height>
+                                    </size>
+                                </property>
+                            </widget>
+                        </hbox>
+                    </widget>
+                    <spacer row="0" column="0" rowspan="1" colspan="2">
                         <property name="name">
-                            <cstring>unnamed</cstring>
+                            <cstring>spacer1</cstring>
                         </property>
-                        <spacer>
-                            <property name="name">
-                                <cstring>spacer1</cstring>
-                            </property>
-                            <property name="orientation">
-                                <enum>Horizontal</enum>
-                            </property>
-                            <property name="sizeType">
-                                <enum>Expanding</enum>
-                            </property>
-                            <property name="sizeHint">
-                                <size>
-                                    <width>281</width>
-                                    <height>21</height>
-                                </size>
-                            </property>
-                        </spacer>
-                        <widget class="QPushButton">
-                            <property name="name">
-                                <cstring>bParametres</cstring>
-                            </property>
-                            <property name="sizePolicy">
-                                <sizepolicy>
-                                    <hsizetype>0</hsizetype>
-                                    <vsizetype>0</vsizetype>
-                                    <horstretch>0</horstretch>
-                                    <verstretch>0</verstretch>
-                                </sizepolicy>
-                            </property>
-                            <property name="minimumSize">
-                                <size>
-                                    <width>140</width>
-                                    <height>30</height>
-                                </size>
-                            </property>
-                            <property name="text">
-                                <string>Parametres</string>
-                            </property>
-                        </widget>
-                    </hbox>
-                </widget>
-                <spacer>
-                    <property name="name">
-                        <cstring>spacer2</cstring>
-                    </property>
-                    <property name="orientation">
-                        <enum>Vertical</enum>
-                    </property>
-                    <property name="sizeType">
-                        <enum>Expanding</enum>
-                    </property>
-                    <property name="sizeHint">
-                        <size>
-                            <width>20</width>
-                            <height>81</height>
-                        </size>
-                    </property>
-                    <property name="geometry">
-                        <rect>
-                            <x>218</x>
-                            <y>49</y>
-                            <width>20</width>
-                            <height>116</height>
-                        </rect>
-                    </property>
-                </spacer>
-                <spacer>
-                    <property name="name">
-                        <cstring>spacer3</cstring>
-                    </property>
-                    <property name="orientation">
-                        <enum>Vertical</enum>
-                    </property>
-                    <property name="sizeType">
-                        <enum>Expanding</enum>
-                    </property>
-                    <property name="sizeHint">
-                        <size>
-                            <width>41</width>
-                            <height>91</height>
-                        </size>
-                    </property>
-                    <property name="geometry">
-                        <rect>
-                            <x>207</x>
-                            <y>229</y>
-                            <width>41</width>
-                            <height>115</height>
-                        </rect>
-                    </property>
-                </spacer>
-                <widget class="QLayoutWidget">
-                    <property name="name">
-                        <cstring>layout4</cstring>
-                    </property>
-                    <property name="geometry">
-                        <rect>
-                            <x>10</x>
-                            <y>400</y>
-                            <width>440</width>
-                            <height>23</height>
-                        </rect>
-                    </property>
-                    <hbox>
+                        <property name="orientation">
+                            <enum>Horizontal</enum>
+                        </property>
+                        <property name="sizeType">
+                            <enum>Expanding</enum>
+                        </property>
+                        <property name="sizeHint">
+                            <size>
+                                <width>286</width>
+                                <height>21</height>
+                            </size>
+                        </property>
+                    </spacer>
+                    <widget class="QPushButton" row="0" column="2">
                         <property name="name">
-                            <cstring>unnamed</cstring>
+                            <cstring>bParametres</cstring>
                         </property>
-                        <widget class="QPushButton">
-                            <property name="name">
-                                <cstring>bSup</cstring>
-                            </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="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="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>
-                    </hbox>
-                </widget>
+                        <property name="sizePolicy">
+                            <sizepolicy>
+                                <hsizetype>0</hsizetype>
+                                <vsizetype>0</vsizetype>
+                                <horstretch>0</horstretch>
+                                <verstretch>0</verstretch>
+                            </sizepolicy>
+                        </property>
+                        <property name="minimumSize">
+                            <size>
+                                <width>140</width>
+                                <height>30</height>
+                            </size>
+                        </property>
+                        <property name="text">
+                            <string>Parametres</string>
+                        </property>
+                    </widget>
+                    <widget class="QPushButton" row="5" column="0">
+                        <property name="name">
+                            <cstring>bSup</cstring>
+                        </property>
+                        <property name="minimumSize">
+                            <size>
+                                <width>0</width>
+                                <height>30</height>
+                            </size>
+                        </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" row="5" column="1">
+                        <property name="name">
+                            <cstring>bOk</cstring>
+                        </property>
+                        <property name="minimumSize">
+                            <size>
+                                <width>0</width>
+                                <height>30</height>
+                            </size>
+                        </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" row="5" column="2">
+                        <property name="name">
+                            <cstring>bHelp</cstring>
+                        </property>
+                        <property name="minimumSize">
+                            <size>
+                                <width>0</width>
+                                <height>30</height>
+                            </size>
+                        </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>
+                    <spacer row="2" column="1">
+                        <property name="name">
+                            <cstring>spacer4</cstring>
+                        </property>
+                        <property name="orientation">
+                            <enum>Vertical</enum>
+                        </property>
+                        <property name="sizeType">
+                            <enum>Expanding</enum>
+                        </property>
+                        <property name="sizeHint">
+                            <size>
+                                <width>41</width>
+                                <height>110</height>
+                            </size>
+                        </property>
+                    </spacer>
+                    <spacer row="4" column="1">
+                        <property name="name">
+                            <cstring>spacer3</cstring>
+                        </property>
+                        <property name="orientation">
+                            <enum>Vertical</enum>
+                        </property>
+                        <property name="sizeType">
+                            <enum>Expanding</enum>
+                        </property>
+                        <property name="sizeHint">
+                            <size>
+                                <width>21</width>
+                                <height>111</height>
+                            </size>
+                        </property>
+                    </spacer>
+                    <widget class="QLabel" row="3" column="0" rowspan="1" colspan="3">
+                        <property name="name">
+                            <cstring>Commentaire</cstring>
+                        </property>
+                        <property name="minimumSize">
+                            <size>
+                                <width>430</width>
+                                <height>40</height>
+                            </size>
+                        </property>
+                        <property name="text">
+                            <string></string>
+                        </property>
+                    </widget>
+                </grid>
             </widget>
         </widget>
     </grid>
index e5bddc235ab2031a210e456f514d40e362ffd8ee..690950be70dbb9fd86ae46f998d24f9881493fc7 100644 (file)
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desUniqueInto.ui'
 #
-# Created: mar mar 4 10:36:39 2008
+# Created: mar mar 4 16:32:40 2008
 #      by: The PyQt User Interface Compiler (pyuic) 3.13
 #
 # WARNING! All changes made in this file will be lost!
@@ -25,33 +25,40 @@ class DUnIn(QWidget):
         self.tabuniqueinto = QTabWidget(self,"tabuniqueinto")
 
         self.Widget8 = QWidget(self.tabuniqueinto,"Widget8")
-
-        self.textLabel2 = QLabel(self.Widget8,"textLabel2")
-        self.textLabel2.setGeometry(QRect(11,11,434,16))
-
-        self.listBoxVal = QListBox(self.Widget8,"listBoxVal")
-        self.listBoxVal.setGeometry(QRect(11,33,434,321))
+        Widget8Layout = QGridLayout(self.Widget8,1,1,11,6,"Widget8Layout")
 
         self.Commentaire = QLabel(self.Widget8,"Commentaire")
-        self.Commentaire.setGeometry(QRect(11,360,434,30))
         self.Commentaire.setMinimumSize(QSize(420,30))
 
-        LayoutWidget = QWidget(self.Widget8,"layout2")
-        LayoutWidget.setGeometry(QRect(10,400,440,23))
-        layout2 = QHBoxLayout(LayoutWidget,11,6,"layout2")
+        Widget8Layout.addWidget(self.Commentaire,2,0)
 
-        self.bSup = QPushButton(LayoutWidget,"bSup")
+        layout2 = QHBoxLayout(None,0,6,"layout2")
+
+        self.bSup = QPushButton(self.Widget8,"bSup")
+        self.bSup.setMinimumSize(QSize(0,30))
         self.bSup.setAutoDefault(1)
         layout2.addWidget(self.bSup)
 
-        self.bOk = QPushButton(LayoutWidget,"bOk")
+        self.bOk = QPushButton(self.Widget8,"bOk")
+        self.bOk.setMinimumSize(QSize(0,30))
         self.bOk.setAutoDefault(1)
         self.bOk.setDefault(1)
         layout2.addWidget(self.bOk)
 
-        self.bHelp = QPushButton(LayoutWidget,"bHelp")
+        self.bHelp = QPushButton(self.Widget8,"bHelp")
+        self.bHelp.setMinimumSize(QSize(0,30))
         self.bHelp.setAutoDefault(1)
         layout2.addWidget(self.bHelp)
+
+        Widget8Layout.addLayout(layout2,3,0)
+
+        self.listBoxVal = QListBox(self.Widget8,"listBoxVal")
+
+        Widget8Layout.addWidget(self.listBoxVal,1,0)
+
+        self.textLabel2 = QLabel(self.Widget8,"textLabel2")
+
+        Widget8Layout.addWidget(self.textLabel2,0,0)
         self.tabuniqueinto.insertTab(self.Widget8,QString(""))
 
         DUnInLayout.addWidget(self.tabuniqueinto,0,0)
@@ -68,7 +75,6 @@ class DUnIn(QWidget):
 
     def languageChange(self):
         self.setCaption(self.__tr("DUnIn"))
-        self.textLabel2.setText(self.__tr("<b><u><p align=\"center\">Valeurs possibles</p></u></b>"))
         self.Commentaire.setText(QString.null)
         self.bSup.setText(self.__tr("&Supprimer"))
         self.bSup.setAccel(self.__tr("Alt+S"))
@@ -79,6 +85,7 @@ class DUnIn(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><u><p align=\"center\">Valeurs possibles</p></u></b>"))
         self.tabuniqueinto.changeTab(self.Widget8,self.__tr("Saisir Valeur"))
 
 
index ffe01801bb8aa0e8d85e485cc020d844636db6d7..67f99a9888db11f110a466d1aefd034ee1dddb15 100644 (file)
                 <attribute name="title">
                     <string>Saisir Valeur</string>
                 </attribute>
-                <widget class="QLabel">
+                <grid>
                     <property name="name">
-                        <cstring>textLabel2</cstring>
+                        <cstring>unnamed</cstring>
                     </property>
-                    <property name="geometry">
-                        <rect>
-                            <x>11</x>
-                            <y>11</y>
-                            <width>434</width>
-                            <height>16</height>
-                        </rect>
-                    </property>
-                    <property name="text">
-                        <string>&lt;b&gt;&lt;u&gt;&lt;p align="center"&gt;Valeurs possibles&lt;/p&gt;&lt;/u&gt;&lt;/b&gt;</string>
-                    </property>
-                </widget>
-                <widget class="QListBox">
-                    <property name="name">
-                        <cstring>listBoxVal</cstring>
-                    </property>
-                    <property name="geometry">
-                        <rect>
-                            <x>11</x>
-                            <y>33</y>
-                            <width>434</width>
-                            <height>321</height>
-                        </rect>
-                    </property>
-                </widget>
-                <widget class="QLabel">
-                    <property name="name">
-                        <cstring>Commentaire</cstring>
-                    </property>
-                    <property name="geometry">
-                        <rect>
-                            <x>11</x>
-                            <y>360</y>
-                            <width>434</width>
-                            <height>30</height>
-                        </rect>
-                    </property>
-                    <property name="minimumSize">
-                        <size>
-                            <width>420</width>
-                            <height>30</height>
-                        </size>
-                    </property>
-                    <property name="text">
-                        <string></string>
-                    </property>
-                </widget>
-                <widget class="QLayoutWidget">
-                    <property name="name">
-                        <cstring>layout2</cstring>
-                    </property>
-                    <property name="geometry">
-                        <rect>
-                            <x>10</x>
-                            <y>400</y>
-                            <width>440</width>
-                            <height>23</height>
-                        </rect>
-                    </property>
-                    <hbox>
+                    <widget class="QLabel" row="2" column="0">
                         <property name="name">
-                            <cstring>unnamed</cstring>
+                            <cstring>Commentaire</cstring>
                         </property>
-                        <widget class="QPushButton">
-                            <property name="name">
-                                <cstring>bSup</cstring>
-                            </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="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="minimumSize">
+                            <size>
+                                <width>420</width>
+                                <height>30</height>
+                            </size>
+                        </property>
+                        <property name="text">
+                            <string></string>
+                        </property>
+                    </widget>
+                    <widget class="QLayoutWidget" row="3" column="0">
+                        <property name="name">
+                            <cstring>layout2</cstring>
+                        </property>
+                        <hbox>
                             <property name="name">
-                                <cstring>bHelp</cstring>
-                            </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>
-                    </hbox>
-                </widget>
+                                <cstring>unnamed</cstring>
+                            </property>
+                            <widget class="QPushButton">
+                                <property name="name">
+                                    <cstring>bSup</cstring>
+                                </property>
+                                <property name="minimumSize">
+                                    <size>
+                                        <width>0</width>
+                                        <height>30</height>
+                                    </size>
+                                </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="minimumSize">
+                                    <size>
+                                        <width>0</width>
+                                        <height>30</height>
+                                    </size>
+                                </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="minimumSize">
+                                    <size>
+                                        <width>0</width>
+                                        <height>30</height>
+                                    </size>
+                                </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>
+                        </hbox>
+                    </widget>
+                    <widget class="QListBox" row="1" column="0">
+                        <property name="name">
+                            <cstring>listBoxVal</cstring>
+                        </property>
+                    </widget>
+                    <widget class="QLabel" row="0" column="0">
+                        <property name="name">
+                            <cstring>textLabel2</cstring>
+                        </property>
+                        <property name="text">
+                            <string>&lt;b&gt;&lt;u&gt;&lt;p align="center"&gt;Valeurs possibles&lt;/p&gt;&lt;/u&gt;&lt;/b&gt;</string>
+                        </property>
+                    </widget>
+                </grid>
             </widget>
         </widget>
     </grid>
index dbaf4f9d7c88ec00e53b04dbcc36a83562d581a0..79cf8fd86889a9b28dbaebf427a5a5f703cc54ad 100644 (file)
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desUniqueSDCO.ui'
 #
-# Created: mar mar 4 10:36:39 2008
+# Created: mar mar 4 17:53:43 2008
 #      by: The PyQt User Interface Compiler (pyuic) 3.13
 #
 # WARNING! All changes made in this file will be lost!
@@ -25,70 +25,73 @@ class DUnSDCO(QWidget):
         self.tabuniqueinto = QTabWidget(self,"tabuniqueinto")
 
         self.Widget8 = QWidget(self.tabuniqueinto,"Widget8")
+        Widget8Layout = QGridLayout(self.Widget8,1,1,11,6,"Widget8Layout")
 
-        LayoutWidget = QWidget(self.Widget8,"layout4")
-        LayoutWidget.setGeometry(QRect(11,11,413,44))
-        layout4 = QHBoxLayout(LayoutWidget,11,6,"layout4")
+        self.Commentaire = QLabel(self.Widget8,"Commentaire")
+        self.Commentaire.setMinimumSize(QSize(311,30))
 
-        self.textLabel1 = QLabel(LayoutWidget,"textLabel1")
-        layout4.addWidget(self.textLabel1)
+        Widget8Layout.addMultiCellWidget(self.Commentaire,3,3,0,3)
 
-        layout3 = QVBoxLayout(None,0,6,"layout3")
+        self.bSup = QPushButton(self.Widget8,"bSup")
+        self.bSup.setMinimumSize(QSize(0,30))
+        self.bSup.setAutoDefault(1)
 
-        self.rbOui = QRadioButton(LayoutWidget,"rbOui")
-        self.rbOui.setEnabled(1)
-        self.rbOui.setChecked(1)
-        layout3.addWidget(self.rbOui)
+        Widget8Layout.addWidget(self.bSup,4,0)
 
-        self.rbNon = QRadioButton(LayoutWidget,"rbNon")
-        self.rbNon.setEnabled(0)
-        self.rbNon.setChecked(0)
-        layout3.addWidget(self.rbNon)
-        layout4.addLayout(layout3)
+        self.bOk = QPushButton(self.Widget8,"bOk")
+        self.bOk.setMinimumSize(QSize(0,30))
+        self.bOk.setAutoDefault(1)
+        self.bOk.setDefault(1)
+
+        Widget8Layout.addMultiCellWidget(self.bOk,4,4,1,2)
+
+        self.bHelp = QPushButton(self.Widget8,"bHelp")
+        self.bHelp.setMinimumSize(QSize(0,30))
+        self.bHelp.setAutoDefault(1)
+
+        Widget8Layout.addWidget(self.bHelp,4,3)
+
+        self.textLabel2 = QLabel(self.Widget8,"textLabel2")
 
-        LayoutWidget_2 = QWidget(self.Widget8,"layout5")
-        LayoutWidget_2.setGeometry(QRect(11,61,413,49))
-        layout5 = QVBoxLayout(LayoutWidget_2,11,6,"layout5")
+        Widget8Layout.addMultiCellWidget(self.textLabel2,2,2,0,3)
 
-        self.frame3 = QFrame(LayoutWidget_2,"frame3")
+        self.frame3 = QFrame(self.Widget8,"frame3")
         self.frame3.setFrameShape(QFrame.StyledPanel)
         self.frame3.setFrameShadow(QFrame.Raised)
+        frame3Layout = QGridLayout(self.frame3,1,1,11,6,"frame3Layout")
 
-        self.textLabel2_2 = QLabel(self.frame3,"textLabel2_2")
-        self.textLabel2_2.setGeometry(QRect(10,10,280,26))
-        layout5.addWidget(self.frame3)
+        layout5 = QGridLayout(None,1,1,0,6,"layout5")
 
-        self.LESDCO = QLineEdit(LayoutWidget_2,"LESDCO")
+        self.LESDCO = QLineEdit(self.frame3,"LESDCO")
         self.LESDCO.setMinimumSize(QSize(300,40))
-        layout5.addWidget(self.LESDCO)
 
-        self.textLabel2 = QLabel(self.Widget8,"textLabel2")
-        self.textLabel2.setGeometry(QRect(11,116,413,18))
+        layout5.addWidget(self.LESDCO,1,0)
 
-        self.Commentaire = QLabel(self.Widget8,"Commentaire")
-        self.Commentaire.setGeometry(QRect(11,360,413,30))
-        self.Commentaire.setMinimumSize(QSize(311,30))
+        self.textLabel2_2 = QLabel(self.frame3,"textLabel2_2")
 
-        LayoutWidget_3 = QWidget(self.Widget8,"layout6")
-        LayoutWidget_3.setGeometry(QRect(17,390,410,23))
-        layout6 = QHBoxLayout(LayoutWidget_3,11,6,"layout6")
+        layout5.addWidget(self.textLabel2_2,0,0)
 
-        self.bSup = QPushButton(LayoutWidget_3,"bSup")
-        self.bSup.setAutoDefault(1)
-        layout6.addWidget(self.bSup)
-        spacer3_3 = QSpacerItem(20,20,QSizePolicy.Expanding,QSizePolicy.Minimum)
-        layout6.addItem(spacer3_3)
+        frame3Layout.addLayout(layout5,0,0)
 
-        self.bOk = QPushButton(LayoutWidget_3,"bOk")
-        self.bOk.setAutoDefault(1)
-        self.bOk.setDefault(1)
-        layout6.addWidget(self.bOk)
-        spacer3_3_3 = QSpacerItem(30,20,QSizePolicy.Expanding,QSizePolicy.Minimum)
-        layout6.addItem(spacer3_3_3)
+        Widget8Layout.addMultiCellWidget(self.frame3,1,1,0,3)
 
-        self.bHelp = QPushButton(LayoutWidget_3,"bHelp")
-        self.bHelp.setAutoDefault(1)
-        layout6.addWidget(self.bHelp)
+        self.textLabel1 = QLabel(self.Widget8,"textLabel1")
+
+        Widget8Layout.addMultiCellWidget(self.textLabel1,0,0,0,1)
+
+        layout6 = QVBoxLayout(None,0,6,"layout6")
+
+        self.rbOui = QRadioButton(self.Widget8,"rbOui")
+        self.rbOui.setEnabled(1)
+        self.rbOui.setChecked(1)
+        layout6.addWidget(self.rbOui)
+
+        self.rbNon = QRadioButton(self.Widget8,"rbNon")
+        self.rbNon.setEnabled(0)
+        self.rbNon.setChecked(0)
+        layout6.addWidget(self.rbNon)
+
+        Widget8Layout.addMultiCellLayout(layout6,0,0,2,3)
         self.tabuniqueinto.insertTab(self.Widget8,QString(""))
 
         DUnSDCOLayout.addWidget(self.tabuniqueinto,0,0)
@@ -107,11 +110,6 @@ class DUnSDCO(QWidget):
 
     def languageChange(self):
         self.setCaption(self.__tr("DUnIn"))
-        self.textLabel1.setText(self.__tr("<font size=\"+1\">Nouveau Concept : </font>"))
-        self.rbOui.setText(self.__tr("Oui"))
-        self.rbNon.setText(self.__tr("Non"))
-        self.textLabel2_2.setText(self.__tr("<font size=\"+2\">Nom du nouveau concept : </font>"))
-        self.textLabel2.setText(self.__tr("<font size=\"+1\">Un objet de type CO est attendu</font>"))
         self.Commentaire.setText(QString.null)
         self.bSup.setText(self.__tr("&Supprimer"))
         self.bSup.setAccel(self.__tr("Alt+S"))
@@ -122,6 +120,11 @@ class DUnSDCO(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("<font size=\"+1\">Un objet de type CO est attendu</font>"))
+        self.textLabel2_2.setText(self.__tr("<font size=\"+2\">Nom du nouveau concept : </font>"))
+        self.textLabel1.setText(self.__tr("<font size=\"+1\">Nouveau Concept : </font>"))
+        self.rbOui.setText(self.__tr("Oui"))
+        self.rbNon.setText(self.__tr("Non"))
         self.tabuniqueinto.changeTab(self.Widget8,self.__tr("Saisir Valeur"))
 
 
index 9d3e0eae9f64ae6be70ac1583b75f992410caae2..0375abdc0d111216c65103e4ae950a0ebdc8381e 100644 (file)
                 <attribute name="title">
                     <string>Saisir Valeur</string>
                 </attribute>
-                <widget class="QLayoutWidget">
+                <grid>
                     <property name="name">
-                        <cstring>layout4</cstring>
+                        <cstring>unnamed</cstring>
                     </property>
-                    <property name="geometry">
-                        <rect>
-                            <x>11</x>
-                            <y>11</y>
-                            <width>413</width>
-                            <height>44</height>
-                        </rect>
-                    </property>
-                    <hbox>
+                    <widget class="QLabel" row="3" column="0" rowspan="1" colspan="4">
                         <property name="name">
-                            <cstring>unnamed</cstring>
+                            <cstring>Commentaire</cstring>
                         </property>
-                        <widget class="QLabel">
-                            <property name="name">
-                                <cstring>textLabel1</cstring>
-                            </property>
-                            <property name="text">
-                                <string>&lt;font size="+1"&gt;Nouveau Concept : &lt;/font&gt;</string>
-                            </property>
-                        </widget>
-                        <widget class="QLayoutWidget">
+                        <property name="minimumSize">
+                            <size>
+                                <width>311</width>
+                                <height>30</height>
+                            </size>
+                        </property>
+                        <property name="text">
+                            <string></string>
+                        </property>
+                    </widget>
+                    <widget class="QPushButton" row="4" column="0">
+                        <property name="name">
+                            <cstring>bSup</cstring>
+                        </property>
+                        <property name="minimumSize">
+                            <size>
+                                <width>0</width>
+                                <height>30</height>
+                            </size>
+                        </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" row="4" column="1" rowspan="1" colspan="2">
+                        <property name="name">
+                            <cstring>bOk</cstring>
+                        </property>
+                        <property name="minimumSize">
+                            <size>
+                                <width>0</width>
+                                <height>30</height>
+                            </size>
+                        </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" row="4" column="3">
+                        <property name="name">
+                            <cstring>bHelp</cstring>
+                        </property>
+                        <property name="minimumSize">
+                            <size>
+                                <width>0</width>
+                                <height>30</height>
+                            </size>
+                        </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="QLabel" row="2" column="0" rowspan="1" colspan="4">
+                        <property name="name">
+                            <cstring>textLabel2</cstring>
+                        </property>
+                        <property name="text">
+                            <string>&lt;font size="+1"&gt;Un objet de type CO est attendu&lt;/font&gt;</string>
+                        </property>
+                    </widget>
+                    <widget class="QFrame" row="1" column="0" rowspan="1" colspan="4">
+                        <property name="name">
+                            <cstring>frame3</cstring>
+                        </property>
+                        <property name="frameShape">
+                            <enum>StyledPanel</enum>
+                        </property>
+                        <property name="frameShadow">
+                            <enum>Raised</enum>
+                        </property>
+                        <grid>
                             <property name="name">
-                                <cstring>layout3</cstring>
+                                <cstring>unnamed</cstring>
                             </property>
-                            <vbox>
+                            <widget class="QLayoutWidget" row="0" column="0">
                                 <property name="name">
-                                    <cstring>unnamed</cstring>
+                                    <cstring>layout5</cstring>
                                 </property>
-                                <widget class="QRadioButton">
+                                <grid>
                                     <property name="name">
-                                        <cstring>rbOui</cstring>
-                                    </property>
-                                    <property name="enabled">
-                                        <bool>true</bool>
-                                    </property>
-                                    <property name="text">
-                                        <string>Oui</string>
-                                    </property>
-                                    <property name="checked">
-                                        <bool>true</bool>
-                                    </property>
-                                </widget>
-                                <widget class="QRadioButton">
-                                    <property name="name">
-                                        <cstring>rbNon</cstring>
-                                    </property>
-                                    <property name="enabled">
-                                        <bool>false</bool>
-                                    </property>
-                                    <property name="text">
-                                        <string>Non</string>
+                                        <cstring>unnamed</cstring>
                                     </property>
-                                    <property name="checked">
-                                        <bool>false</bool>
-                                    </property>
-                                </widget>
-                            </vbox>
-                        </widget>
-                    </hbox>
-                </widget>
-                <widget class="QLayoutWidget">
-                    <property name="name">
-                        <cstring>layout5</cstring>
-                    </property>
-                    <property name="geometry">
-                        <rect>
-                            <x>11</x>
-                            <y>61</y>
-                            <width>413</width>
-                            <height>49</height>
-                        </rect>
-                    </property>
-                    <vbox>
+                                    <widget class="QLineEdit" row="1" column="0">
+                                        <property name="name">
+                                            <cstring>LESDCO</cstring>
+                                        </property>
+                                        <property name="minimumSize">
+                                            <size>
+                                                <width>300</width>
+                                                <height>40</height>
+                                            </size>
+                                        </property>
+                                    </widget>
+                                    <widget class="QLabel" row="0" column="0">
+                                        <property name="name">
+                                            <cstring>textLabel2_2</cstring>
+                                        </property>
+                                        <property name="text">
+                                            <string>&lt;font size="+2"&gt;Nom du nouveau concept : &lt;/font&gt;</string>
+                                        </property>
+                                    </widget>
+                                </grid>
+                            </widget>
+                        </grid>
+                    </widget>
+                    <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
+                        <property name="name">
+                            <cstring>textLabel1</cstring>
+                        </property>
+                        <property name="text">
+                            <string>&lt;font size="+1"&gt;Nouveau Concept : &lt;/font&gt;</string>
+                        </property>
+                    </widget>
+                    <widget class="QLayoutWidget" row="0" column="2" rowspan="1" colspan="2">
                         <property name="name">
-                            <cstring>unnamed</cstring>
+                            <cstring>layout6</cstring>
                         </property>
-                        <widget class="QFrame">
+                        <vbox>
                             <property name="name">
-                                <cstring>frame3</cstring>
-                            </property>
-                            <property name="frameShape">
-                                <enum>StyledPanel</enum>
+                                <cstring>unnamed</cstring>
                             </property>
-                            <property name="frameShadow">
-                                <enum>Raised</enum>
-                            </property>
-                            <widget class="QLabel">
+                            <widget class="QRadioButton">
                                 <property name="name">
-                                    <cstring>textLabel2_2</cstring>
+                                    <cstring>rbOui</cstring>
                                 </property>
-                                <property name="geometry">
-                                    <rect>
-                                        <x>10</x>
-                                        <y>10</y>
-                                        <width>280</width>
-                                        <height>26</height>
-                                    </rect>
+                                <property name="enabled">
+                                    <bool>true</bool>
                                 </property>
                                 <property name="text">
-                                    <string>&lt;font size="+2"&gt;Nom du nouveau concept : &lt;/font&gt;</string>
+                                    <string>Oui</string>
+                                </property>
+                                <property name="checked">
+                                    <bool>true</bool>
                                 </property>
                             </widget>
-                        </widget>
-                        <widget class="QLineEdit">
-                            <property name="name">
-                                <cstring>LESDCO</cstring>
-                            </property>
-                            <property name="minimumSize">
-                                <size>
-                                    <width>300</width>
-                                    <height>40</height>
-                                </size>
-                            </property>
-                        </widget>
-                    </vbox>
-                </widget>
-                <widget class="QLabel">
-                    <property name="name">
-                        <cstring>textLabel2</cstring>
-                    </property>
-                    <property name="geometry">
-                        <rect>
-                            <x>11</x>
-                            <y>116</y>
-                            <width>413</width>
-                            <height>18</height>
-                        </rect>
-                    </property>
-                    <property name="text">
-                        <string>&lt;font size="+1"&gt;Un objet de type CO est attendu&lt;/font&gt;</string>
-                    </property>
-                </widget>
-                <spacer>
-                    <property name="name">
-                        <cstring>spacer5</cstring>
-                    </property>
-                    <property name="orientation">
-                        <enum>Vertical</enum>
-                    </property>
-                    <property name="sizeType">
-                        <enum>Expanding</enum>
-                    </property>
-                    <property name="sizeHint">
-                        <size>
-                            <width>31</width>
-                            <height>131</height>
-                        </size>
-                    </property>
-                    <property name="geometry">
-                        <rect>
-                            <x>202</x>
-                            <y>140</y>
-                            <width>31</width>
-                            <height>214</height>
-                        </rect>
-                    </property>
-                </spacer>
-                <widget class="QLabel">
-                    <property name="name">
-                        <cstring>Commentaire</cstring>
-                    </property>
-                    <property name="geometry">
-                        <rect>
-                            <x>11</x>
-                            <y>360</y>
-                            <width>413</width>
-                            <height>30</height>
-                        </rect>
-                    </property>
-                    <property name="minimumSize">
-                        <size>
-                            <width>311</width>
-                            <height>30</height>
-                        </size>
-                    </property>
-                    <property name="text">
-                        <string></string>
-                    </property>
-                </widget>
-                <widget class="QLayoutWidget">
-                    <property name="name">
-                        <cstring>layout6</cstring>
-                    </property>
-                    <property name="geometry">
-                        <rect>
-                            <x>17</x>
-                            <y>390</y>
-                            <width>410</width>
-                            <height>23</height>
-                        </rect>
-                    </property>
-                    <hbox>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <widget class="QPushButton">
-                            <property name="name">
-                                <cstring>bSup</cstring>
-                            </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>
-                        <spacer>
-                            <property name="name">
-                                <cstring>spacer3_3</cstring>
-                            </property>
-                            <property name="orientation">
-                                <enum>Horizontal</enum>
-                            </property>
-                            <property name="sizeType">
-                                <enum>Expanding</enum>
-                            </property>
-                            <property name="sizeHint">
-                                <size>
-                                    <width>20</width>
-                                    <height>20</height>
-                                </size>
-                            </property>
-                        </spacer>
-                        <widget class="QPushButton">
-                            <property name="name">
-                                <cstring>bOk</cstring>
-                            </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>
-                        <spacer>
-                            <property name="name">
-                                <cstring>spacer3_3_3</cstring>
-                            </property>
-                            <property name="orientation">
-                                <enum>Horizontal</enum>
-                            </property>
-                            <property name="sizeType">
-                                <enum>Expanding</enum>
-                            </property>
-                            <property name="sizeHint">
-                                <size>
-                                    <width>30</width>
-                                    <height>20</height>
-                                </size>
-                            </property>
-                        </spacer>
-                        <widget class="QPushButton">
-                            <property name="name">
-                                <cstring>bHelp</cstring>
-                            </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>
-                    </hbox>
-                </widget>
+                            <widget class="QRadioButton">
+                                <property name="name">
+                                    <cstring>rbNon</cstring>
+                                </property>
+                                <property name="enabled">
+                                    <bool>false</bool>
+                                </property>
+                                <property name="text">
+                                    <string>Non</string>
+                                </property>
+                                <property name="checked">
+                                    <bool>false</bool>
+                                </property>
+                            </widget>
+                        </vbox>
+                    </widget>
+                </grid>
             </widget>
         </widget>
     </grid>
index 8d7607459cc525aa2b29fa40ce17f2eca669279c..185c6d43625fa4a9734da098d161f36f1430a533 100644 (file)
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desUniqueSDCOInto.ui'
 #
-# Created: mar mar 4 10:36:39 2008
+# Created: mar mar 4 17:57:52 2008
 #      by: The PyQt User Interface Compiler (pyuic) 3.13
 #
 # WARNING! All changes made in this file will be lost!
@@ -29,20 +29,20 @@ class DUnSDCOInto(QWidget):
 
         self.textLabel2 = QLabel(self.Widget8,"textLabel2")
 
-        Widget8Layout.addWidget(self.textLabel2,0,0)
+        Widget8Layout.addMultiCellWidget(self.textLabel2,0,0,0,2)
 
         self.LBSDCO = QListBox(self.Widget8,"LBSDCO")
 
-        Widget8Layout.addWidget(self.LBSDCO,1,0)
+        Widget8Layout.addMultiCellWidget(self.LBSDCO,1,1,0,2)
 
         self.textLabel2_3 = QLabel(self.Widget8,"textLabel2_3")
 
-        Widget8Layout.addWidget(self.textLabel2_3,5,0)
+        Widget8Layout.addMultiCellWidget(self.textLabel2_3,5,5,0,2)
 
         self.Commentaire = QLabel(self.Widget8,"Commentaire")
         self.Commentaire.setMinimumSize(QSize(420,30))
 
-        Widget8Layout.addWidget(self.Commentaire,4,0)
+        Widget8Layout.addMultiCellWidget(self.Commentaire,4,4,0,2)
 
         layout3 = QGridLayout(None,1,1,0,6,"layout3")
 
@@ -61,7 +61,7 @@ class DUnSDCOInto(QWidget):
 
         layout3.addMultiCellWidget(self.textLabel1,0,1,0,0)
 
-        Widget8Layout.addLayout(layout3,2,0)
+        Widget8Layout.addMultiCellLayout(layout3,2,2,0,2)
 
         layout6 = QHBoxLayout(None,0,6,"layout6")
 
@@ -74,28 +74,30 @@ class DUnSDCOInto(QWidget):
         self.textLabel2_2.setGeometry(QRect(20,10,150,30))
         layout6.addWidget(self.frame3)
 
-        self.LEDSCO = QLineEdit(self.Widget8,"LEDSCO")
-        self.LEDSCO.setMinimumSize(QSize(220,40))
-        layout6.addWidget(self.LEDSCO)
+        self.LESDCO = QLineEdit(self.Widget8,"LESDCO")
+        self.LESDCO.setMinimumSize(QSize(220,40))
+        layout6.addWidget(self.LESDCO)
 
-        Widget8Layout.addLayout(layout6,3,0)
-
-        layout4 = QHBoxLayout(None,0,6,"layout4")
+        Widget8Layout.addMultiCellLayout(layout6,3,3,0,2)
 
         self.bSup = QPushButton(self.Widget8,"bSup")
+        self.bSup.setMinimumSize(QSize(0,30))
         self.bSup.setAutoDefault(1)
-        layout4.addWidget(self.bSup)
+
+        Widget8Layout.addWidget(self.bSup,6,0)
 
         self.bOk = QPushButton(self.Widget8,"bOk")
+        self.bOk.setMinimumSize(QSize(0,30))
         self.bOk.setAutoDefault(1)
         self.bOk.setDefault(1)
-        layout4.addWidget(self.bOk)
+
+        Widget8Layout.addWidget(self.bOk,6,1)
 
         self.bHelp = QPushButton(self.Widget8,"bHelp")
+        self.bHelp.setMinimumSize(QSize(0,30))
         self.bHelp.setAutoDefault(1)
-        layout4.addWidget(self.bHelp)
 
-        Widget8Layout.addLayout(layout4,6,0)
+        Widget8Layout.addWidget(self.bHelp,6,2)
         self.tabuniqueinto.insertTab(self.Widget8,QString(""))
 
         DUnSDCOIntoLayout.addWidget(self.tabuniqueinto,0,0)
@@ -111,7 +113,7 @@ class DUnSDCOInto(QWidget):
         self.connect(self.rbNon,SIGNAL("clicked()"),self.BNonPressed)
         self.connect(self.rbOui,SIGNAL("clicked()"),self.BOuiPressed)
         self.connect(self.LBSDCO,SIGNAL("clicked(QListBoxItem*)"),self.LBSDCOReturnPressed)
-        self.connect(self.LEDSCO,SIGNAL("returnPressed()"),self.LESDCOReturnPressed)
+        self.connect(self.LESDCO,SIGNAL("returnPressed()"),self.LESDCOReturnPressed)
 
 
     def languageChange(self):
index fe3fde48b5b00f3bd501ab10636d54a5c5129b13..d6bbb36c489b04e88cf5a628ffc3b8b032134fe2 100644 (file)
@@ -40,7 +40,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QLabel" row="0" column="0">
+                    <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3">
                         <property name="name">
                             <cstring>textLabel2</cstring>
                         </property>
                             <string>&lt;font size="+1"&gt;&lt;u&gt;Structures de données du type requis par l'objet courant &lt;/u&gt;&lt;/font&gt;</string>
                         </property>
                     </widget>
-                    <widget class="QListBox" row="1" column="0">
+                    <widget class="QListBox" row="1" column="0" rowspan="1" colspan="3">
                         <property name="name">
                             <cstring>LBSDCO</cstring>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="5" column="0">
+                    <widget class="QLabel" row="5" column="0" rowspan="1" colspan="3">
                         <property name="name">
                             <cstring>textLabel2_3</cstring>
                         </property>
@@ -61,7 +61,7 @@
                             <string>&lt;font size="+1"&gt;Un objet de type CO est attendu&lt;/font&gt;</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="4" column="0">
+                    <widget class="QLabel" row="4" column="0" rowspan="1" colspan="3">
                         <property name="name">
                             <cstring>Commentaire</cstring>
                         </property>
@@ -75,7 +75,7 @@
                             <string></string>
                         </property>
                     </widget>
-                    <widget class="QLayoutWidget" row="2" column="0">
+                    <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="3">
                         <property name="name">
                             <cstring>layout3</cstring>
                         </property>
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QLayoutWidget" row="3" column="0">
+                    <widget class="QLayoutWidget" row="3" column="0" rowspan="1" colspan="3">
                         <property name="name">
                             <cstring>layout6</cstring>
                         </property>
                             </widget>
                             <widget class="QLineEdit">
                                 <property name="name">
-                                    <cstring>LEDSCO</cstring>
+                                    <cstring>LESDCO</cstring>
                                 </property>
                                 <property name="minimumSize">
                                     <size>
                             </widget>
                         </hbox>
                     </widget>
-                    <widget class="QLayoutWidget" row="6" column="0">
+                    <widget class="QPushButton" row="6" column="0">
                         <property name="name">
-                            <cstring>layout4</cstring>
+                            <cstring>bSup</cstring>
+                        </property>
+                        <property name="minimumSize">
+                            <size>
+                                <width>0</width>
+                                <height>30</height>
+                            </size>
+                        </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" row="6" column="1">
+                        <property name="name">
+                            <cstring>bOk</cstring>
+                        </property>
+                        <property name="minimumSize">
+                            <size>
+                                <width>0</width>
+                                <height>30</height>
+                            </size>
+                        </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" row="6" column="2">
+                        <property name="name">
+                            <cstring>bHelp</cstring>
+                        </property>
+                        <property name="minimumSize">
+                            <size>
+                                <width>0</width>
+                                <height>30</height>
+                            </size>
+                        </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>
-                        <hbox>
-                            <property name="name">
-                                <cstring>unnamed</cstring>
-                            </property>
-                            <widget class="QPushButton">
-                                <property name="name">
-                                    <cstring>bSup</cstring>
-                                </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="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="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>
-                        </hbox>
                     </widget>
                 </grid>
             </widget>
         <slot>LBSDCOReturnPressed()</slot>
     </connection>
     <connection>
-        <sender>LEDSCO</sender>
+        <sender>LESDCO</sender>
         <signal>returnPressed()</signal>
         <receiver>DUnSDCOInto</receiver>
         <slot>LESDCOReturnPressed()</slot>