]> SALOME platform Git repositories - tools/eficas.git/commitdiff
Salome HOME
saauve du 26/05
authorpascale.noyret <pascale.noyret@edf.fr>
Thu, 26 May 2016 10:17:57 +0000 (12:17 +0200)
committerpascale.noyret <pascale.noyret@edf.fr>
Thu, 26 May 2016 10:17:57 +0000 (12:17 +0200)
28 files changed:
InterfaceQT4/browser.py
InterfaceQT4/editor.py
InterfaceQT4/gereListe.py
InterfaceQT4/monChoixCommande.py
InterfaceQT4/monGroupeOptionnel.py
InterfaceQT4/monViewTexte.py
InterfaceQT4/monWidgetCB.py
InterfaceQT4/monWidgetPlusieursInto.py
InterfaceQT4/monWidgetPlusieursTuple.py
InterfaceQT4/qtEficas.py
InterfaceQT4/viewManager.py
UiQT4/CMakeLists.txt
UiQT4/desBaseWidget.ui
UiQT4/desChoixCommandes.ui
UiQT4/desGroupeOptionnel.ui [new file with mode: 0644]
UiQT4/desWidgetCommande.ui
UiQT4/desWidgetCommentaire.ui
UiQT4/desWidgetCreeParam.ui
UiQT4/desWidgetFormule.ui [new file with mode: 0644]
UiQT4/desWidgetOptionnel.ui
UiQT4/desWidgetParam.ui
UiQT4/desWidgetPlusieursInto.ui
UiQT4/desWidgetPlusieursIntoOrdonne.ui
UiQT4/desWidgetRadioButton.ui
UiQT4/desWidgetSimpBool.ui
UiQT4/makefile
UiQT4/myMain.ui
UiQT5/desWidgetPlusieursInto.ui

index 13e98f22d0b28dc402d80ff14ebafdacc34f1162..da5936adb94a27dc383b29756166f2e60cb717df 100644 (file)
@@ -28,6 +28,7 @@ from determine import monEnvQT5
 if monEnvQT5 :
   from PyQt5.QtWidgets import QTreeWidget , QTreeWidgetItem
   from PyQt5.QtGui import QIcon
+  from PyQt5.QtCore  import Qt
 else :
   from PyQt4.QtGui  import *
   from PyQt4.QtCore  import *
@@ -291,7 +292,6 @@ class JDCNode(QTreeWidgetItem,GereRegles):
             else : self.listeItemExpanded.append(enfant.item)
 
         for enfant in self.childrenComplete :
-            p=enfant.vraiParent
             parent=enfant.treeParent
             parent.removeChild(enfant)
             enfant.JESUISOFF=1
@@ -520,7 +520,7 @@ class JDCNode(QTreeWidgetItem,GereRegles):
            if not verifiePosition : return 0
 
         self.tree.inhibeExpand=True
-        obj=self.item.additem(name,index) #CS_pbruno emet le signal 'add'
+        obj=self.item.additem(name,index) # emet le signal 'add'
         if obj is None:obj=0
         if obj == 0:return 0
         try :
@@ -614,8 +614,12 @@ class JDCNode(QTreeWidgetItem,GereRegles):
 
         #print "onValid pour ", self.item.nom
         if self.JESUISOFF==1 : return
-        if hasattr(self,'fenetre') and self.fenetre: self.fenetre.setValide()
+        if hasattr(self,'fenetre') and self.fenetre: 
+           try :
+             self.fenetre.setValide()
+           except :
+             print "onValid pour ", self.item.nom, self,'pb'
+
         if (self.item.nom == "VARIABLE" or self.item.nom == "DISTRIBUTION") and self.item.isvalid():
            self.item.jdc.recalcule_etat_correlation()
         if hasattr(self.item,'forceRecalcul'):
index 346d877913147e5adaeef30f04e3a4702ca9b376..b1d54b7e263e1588f2cd67132a56a589964bee23 100755 (executable)
@@ -89,7 +89,8 @@ class JDCEditor(Ui_baseWidget,QWidget):
         self.code = self.appliEficas.CONFIGURATION.code
         # tres vite a cause du tag. doit etre pase dans CONFIGURATION
 
-        self.afficheListesPliees=False
+        #self.afficheListesPliees=False
+        self.afficheListesPliees=True
         if self.code == "ASTER" or self.code == "monCode" : self.afficheListesPliees =True
 
         self.mode_nouv_commande=self.appliEficas.CONFIGURATION.mode_nouv_commande
@@ -218,10 +219,11 @@ class JDCEditor(Ui_baseWidget,QWidget):
         if jdc_item and self.appliEficas.ssIhm==False:
             self.tree = browser.JDCTree( jdc_item,  self )
         self.appliEficas.construitMenu()
+
+        #############
+        self.splitterSizes =  [320,1320,320]
+        self.splitter.setSizes(self.splitterSizes)
         self.saveSplitterSizes()
-        #if monEnvQT5:
-        #   self.splitter./s
-        #else :
 
 
     #-------------------#  Pour execution avec output et error dans le bash
@@ -1405,7 +1407,7 @@ class JDCEditor(Ui_baseWidget,QWidget):
       if self.inhibeSplitter : return
       if not hasattr(self,'splitter') : return
       if self.splitterSizes[2] != 0 : self.oldSizeWidgetOptionnel = self.splitterSizes[2]
-      # print  self.splitterSizes
+      #print  self.splitterSizes
       #print self.splitter.sizes()
       # PNPNPNPN parfoir self.splitter.sizes() a une longueur de 4...
       nbAGarder=len(self.splitter.sizes())
@@ -1413,6 +1415,7 @@ class JDCEditor(Ui_baseWidget,QWidget):
       for i in range(nbAGarder):
          self.splitterSizes[i] = self.splitter.sizes()[i]
          self.splitter.widget(i).resizeEvent=self.saveSplitterSizes
+      #print self.splitter.sizes()
 
 
     #-----------------------------------------
index 218d63397664a079b3d8e0d2094d4d350314ccd0..640dc9075eece8c941d39871ffbabb74ad3731bf 100644 (file)
@@ -25,7 +25,7 @@ from determine import monEnvQT5
 if monEnvQT5:
    from PyQt5.QtWidgets import QLineEdit, QLabel
    from PyQt5.QtCore    import QEvent, Qt
-   from PyQt5.QtGui     import QIcon
+   from PyQt5.QtGui     import QIcon, QPalette
 else :
    from PyQt4.QtGui import *
    from PyQt4.QtCore import *
@@ -103,11 +103,12 @@ class GereListe:
        else : self.connecterSignauxQT4()
 
    def connecterSignauxQT4(self):
-       self.connect(self.RBHaut,SIGNAL("clicked()"),self.hautPushed)
-       self.connect(self.RBBas,SIGNAL("clicked()"),self.basPushed)
-       self.connect(self.RBMoins,SIGNAL("clicked()"),self.moinsPushed)
-       self.connect(self.RBPlus,SIGNAL("clicked()"),self.plusPushed)
-       self.connect(self.RBVoisListe,SIGNAL("clicked()"),self.voisListePushed)
+       if hasattr(self,'RBHaut'):
+          self.connect(self.RBHaut,SIGNAL("clicked()"),self.hautPushed)
+          self.connect(self.RBBas,SIGNAL("clicked()"),self.basPushed)
+          self.connect(self.RBMoins,SIGNAL("clicked()"),self.moinsPushed)
+          self.connect(self.RBPlus,SIGNAL("clicked()"),self.plusPushed)
+          self.connect(self.RBVoisListe,SIGNAL("clicked()"),self.voisListePushed)
        if hasattr(self,'PBAlpha'):
           self.connect(self.PBAlpha,SIGNAL("clicked()"),self.alphaPushed)
           self.connect(self.PBCata,SIGNAL("clicked()"),self.cataPushed)
@@ -115,11 +116,12 @@ class GereListe:
           self.connect(self.LEFiltre,SIGNAL("returnPressed()"),self.LEFiltreReturnPressed)
 
    def connecterSignaux(self):
-       self.RBHaut.clicked.connect(self.hautPushed)
-       self.RBBas.clicked.connect(self.basPushed)
-       self.RBMoins.clicked.connect(self.moinsPushed)
-       self.RBPlus.clicked.connect(self.plusPushed)
-       self.RBVoisListe.clicked.connect(self.voisListePushed)
+       if hasattr(self,'RBHaut'):
+          self.RBHaut.clicked.connect(self.hautPushed)
+          self.RBBas.clicked.connect(self.basPushed)
+          self.RBMoins.clicked.connect(self.moinsPushed)
+          self.RBPlus.clicked.connect(self.plusPushed)
+          self.RBVoisListe.clicked.connect(self.voisListePushed)
        if hasattr(self,'PBAlpha'):
           self.PBCata.clicked.connect(self.cataPushed)
           self.PBAlpha.clicked.connect(self.alphaPushed)
@@ -137,16 +139,15 @@ class GereListe:
       
    def LEFiltreReturnPressed(self):
        self.filtre= self.LEFiltre.text()
-       self.prepareListeResultat()
+       self.prepareListeResultatFiltre()
 
    def findPushed(self):
        self.filtre= self.LEFiltre.text()
-       self.prepareListeResultat()
+       self.prepareListeResultatFiltre()
 
    def alphaPushed(self):
        print "alphaPushed" ,self.alpha
        if self.alpha == 1 : return
-       print "lllllllmmmmmmmmmmmmmm"
        self.alpha=1
        self.prepareListeResultat()
 
@@ -264,6 +265,17 @@ class GereListe:
        from monSelectVal import MonSelectVal
        MonSelectVal(file=fn,parent=self).show()
 
+   def noircirResultatFiltre(self):
+      filtre=str(self.LEFiltre.text())
+      for cb in self.listeCbRouge:
+          palette = QPalette(Qt.red)
+         palette.setColor(QPalette.WindowText,Qt.black)
+         cb.setPalette(palette)
+          t=cb.text()
+          cb.setText(t)
+      self.LEFiltre.setText("")
+      self.listeCbRouge = []
+
   
 # ----------- #
 class GerePlie:
index 7c3fc4794db8899a08da275a5f8de5ceac4da7fa..d7c34f062e6b85865d1fbbe3dba4ea8cea2d0d87 100644 (file)
@@ -61,6 +61,7 @@ class MonChoixCommande(Ui_ChoixCommandes,QWidget):
           nouveauTitre=debutTitre
       self.editor.appliEficas.setWindowTitle(nouveauTitre)
 
+
       #print self.node.tree
 
       if monEnvQT5 :
@@ -173,15 +174,18 @@ class MonChoixCommande(Ui_ChoixCommandes,QWidget):
       return listeACreer
 
   def ajouteRadioButtons(self):
+      #print 'ds ajouteRadioButtons'
       filtre=str(self.LEFiltre.text())
       if filtre==str("") : filtre=None
       if hasattr(self,'buttonGroup') :
          for b in self.buttonGroup.buttons():
              self.buttonGroup.removeButton(b)
+             b.setParent(None)
              b.close()
       else :
          self.buttonGroup = QButtonGroup()
       for w in self.listeWidget :
+         w.setParent(None)
          w.close()
       self.listeWidget=[]
       if self.affiche_alpha==1 :
index 8711f2f46b75c2b0a84bb32c0cd39fb9533e9cca..0a61ae64bd68322682a9141760dd9e228bac3c09 100644 (file)
@@ -37,11 +37,13 @@ class monButtonCustom(QCheckBox):
 
    def __init__(self,texte,monOptionnel,parent=None):
       QCheckBox.__init__(self,tr(texte),parent)
+      self.mousePressed=True
       self.texte=texte
       self.monOptionnel=monOptionnel
+      self.setToolTip(tr("clicker: affichage aide, double-click: ajout"))
 
    def mouseDoubleClickEvent(self, event):
-      #print "dans mouseDoubleClickEvent", self
+      print "dans mouseDoubleClickEvent", self
       if self not in self.monOptionnel.dicoCb.keys() : 
          event.accept()
          return
@@ -51,14 +53,29 @@ class monButtonCustom(QCheckBox):
       
 
    def mousePressEvent(self, event):
-      #rint "dans mousePressEvent"
-      self.mousePressed=True
       if not( event.button() != Qt.RightButton)  : 
          event.accept()
          return
+      if self.monOptionnel.cbPressed != None :
+         self.monOptionnel.cbPressed.setChecked(False)
+      self.monOptionnel.cbPressed=self
+      if self.mousePressed == False :
+         self.mousePressed=True
+      else :
+         self.mousePressed=False
+         self.ajoutAideMC()
       QCheckBox.mousePressEvent(self, event)
       event.accept()
 
+   def ajoutAideMC(self):
+      maDefinition = self.monOptionnel.parentMC.definition.entites[self.texte]
+      maLangue =  self.monOptionnel.parentMC.jdc.lang
+      if hasattr(maDefinition,maLangue): 
+         monAide = getattr(maDefinition,self.monOptionnel.parentMC.jdc.lang)
+      else :
+         monAide = ""
+      self.monOptionnel.parentMC.editor.affiche_commentaire(monAide)
+  
 
 class MonGroupeOptionnel (QWidget,Ui_groupeOptionnel):
   """
@@ -98,29 +115,14 @@ class MonGroupeOptionnel (QWidget,Ui_groupeOptionnel):
      liste.reverse()
      for mot in liste :
          cb = monButtonCustom(mot,self)
-         #if monEnvQT5:
-         #  cb.clicked.connect(self.ajoutMC)
-         #else :
-         #  self.connect(cb,SIGNAL("clicked()"), self.ajoutMC)
+         if monEnvQT5:
+           cb.clicked.connect(cb.ajoutAideMC)
+         else :
+           self.connect(cb,SIGNAL("clicked()"), cb.ajoutAideMC)
          self.MCOptionnelLayout.insertWidget(0,cb)
          self.dicoCb[cb]=mot
      self.scrollAreaCommandesOptionnelles.horizontalScrollBar().setSliderPosition(0)
      #print "Fin Optionnel ____ affiche", liste
 
-  def CBChecked(self):
-      # ordre ?
-      return
-      for cb in self.dicoCb.keys() :
-          if cb.isChecked()      and self.dicoCb[cb] not in self.listeChecked : self.listeChecked.append(self.dicoCb[cb])
-          if not(cb.isChecked()) and self.dicoCb[cb] in self.listeChecked     : self.listeChecked.remove(self.dicoCb[cb])
-      self.parentMC.recalculeListeMC(self.listeChecked)
+      
 
-#
-#  def ajoutMC(self):
-#     maListe=""
-#     for cb in self.dicoCb.keys():
-#         if cb.isChecked() : maListe+="+"+str(cb.text())
-#     if maListe=="":return
-     #print "dans Optionnel __ ajout de ", maListe
-#     self.parentMC.ajoutMC(maListe)
-#
index 02af852de729040ba4aa9b4501ed46cf67ee79b6..ee796eb72db2c83f55e606bdc93934f6c2875b10 100644 (file)
@@ -25,7 +25,7 @@ from Extensions.i18n import tr
 
 from determine import monEnvQT5
 if monEnvQT5 :
-   from PyQt5.QtWidgets import QDialog, QMessageBox
+   from PyQt5.QtWidgets import QDialog, QMessageBox, QFileDialog
    from PyQt5.QtCore import QSize
 else :
    from PyQt4.QtGui import *
index 796ffded0b7162ceced569c459661f4402421d74..2d5e385e762f20a963c1154090968d3862ed49c0 100644 (file)
@@ -31,6 +31,7 @@ from qtSaisie              import SaisieValeur
 from determine import monEnvQT5
 if monEnvQT5:
     from PyQt5.QtWidgets import QComboBox, QCompleter
+    from PyQt5.QtCore import Qt
 else :
     from PyQt4.QtGui  import *
     from PyQt4.QtCore import *
index ca31a0b546e82acb51ae53a9564546c1cf35ffaa..25c115951adf4f9bb702045547be5082e9aa0fe7 100644 (file)
@@ -24,6 +24,7 @@ import string,types,os
 from determine import monEnvQT5
 if monEnvQT5:
     from PyQt5.QtWidgets  import QCheckBox, QScrollBar, QFrame, QApplication
+    from PyQt5.QtGui  import QPalette
     from PyQt5.QtCore import Qt
 else :
     from PyQt4.QtGui  import *
@@ -36,22 +37,31 @@ from desWidgetPlusieursInto import Ui_WidgetPlusieursInto
 from politiquesValidation   import PolitiquePlusieurs
 from qtSaisie               import SaisieValeur
 from gereListe              import GerePlie
+from gereListe              import GereListe
 
-class MonWidgetPlusieursInto (Ui_WidgetPlusieursInto,Feuille,GerePlie):
+class MonWidgetPlusieursInto (Ui_WidgetPlusieursInto,Feuille,GerePlie,GereListe):
 
   def __init__(self,node,monSimpDef,nom,objSimp,parentQt,commande):
-        #print "MonWidgetPlusieursInto", nom, self
+        print "MonWidgetPlusieursInto", nom, self
         self.index=1
+        self.alpha=0
+        self.listeCB=[]
+        self.toto=0
+        self.listeCbRouge=[]
+        self.listeValeursCourantes=node.item.GetListeValeurs()
+        if self.listeValeursCourantes == None : self.listeValeursCourantes=[]
+
         Feuille.__init__(self,node,monSimpDef,nom,objSimp,parentQt,commande)
-        self.listeValeursCourantes=self.node.item.GetListeValeurs()
+        GereListe.__init__(self)
+
         self.parentQt.commandesLayout.insertWidget(-1,self)
-        #if len(self.listeValeursCourantes) == len(self.monSimpDef.into) : self.CBCheck.setChecked(False)
-        #else : self.CBCheck.setChecked(True)
-        if monEnvQT5 : self.CBCheck.stateChanged.connect(self.change)
-        else         : self.connect(self.CBCheck, SIGNAL('stateChanged(int)'),self.change)
+        if monEnvQT5 : self.CBCheck.stateChanged.connect(self.changeTout)
+        else         : self.connect(self.CBCheck, SIGNAL('stateChanged(int)'),self.changeTout)
+
         self.gereIconePlier()
         self.inhibe=False
         self.finCommentaireListe()
+
         # try except si la liste des possibles est vide
         # prevoir qqchose
         try :
@@ -60,26 +70,37 @@ class MonWidgetPlusieursInto (Ui_WidgetPlusieursInto,Feuille,GerePlie):
           pass
 
 
-  def change(self,int):
-       if self.inhibe:return
+  def changeTout(self,int):
+       if self.inhibe : return
        self.inhibe=True
        if not(self.CBCheck.isChecked()) : 
+          min,max = self.node.item.GetMinMax()
+          if max < len(self.listeAAfficher) :
+             commentaire=tr('impossible de tout selectionner : max =')+str(max)
+             self.editor.affiche_infos(commentaire,Qt.red)
+             self.inhibe=False
+             return
           for i in range(len(self.listeAAfficher)):
               nomCB="lineEditVal"+str(i+1)
               courant=getattr(self,nomCB)
               courant.setChecked(True)
           self.CBCheck.setChecked(False)
        else :
-          min,max = self.node.item.GetMinMax()
           for i in range(len(self.listeAAfficher)):
               nomCB="lineEditVal"+str(i+1)
               courant=getattr(self,nomCB)
               courant.setChecked(False)
           self.CBCheck.setChecked(True)
        self.inhibe=False
+       self.changeValeur()
 
   def setValeurs(self):
-       self.listeValeursCourantes=self.node.item.GetListeValeurs()
+       self.listeValeursCourantes =self.node.item.get_valeur()
+       if self.listeValeursCourantes ==  None : self.listeValeursCourantes=[]
+       #print "ds set Valeur", self.listeValeursCourantes, self.node.item.get_valeur()
+       self.politique=PolitiquePlusieurs(self.node,self.editor)
+       self.vScrollBar = self.scrollArea.verticalScrollBar()
+
        if hasattr(self.node.item.definition.validators,'set_MCSimp'):
             obj=self.node.item.getObject()
             self.node.item.definition.validators.set_MCSimp(obj)
@@ -89,44 +110,53 @@ class MonWidgetPlusieursInto (Ui_WidgetPlusieursInto,Feuille,GerePlie):
                    if self.node.item.definition.validators.verif_item(item)==1:
                       liste.append(item)
                self.listeAAfficher=self.node.item.get_liste_possible(liste)
-               #print self.listeAAfficher
             else: 
                self.listeAAfficher=self.node.item.get_liste_possible([])
        else :
                self.listeAAfficher=self.node.item.get_liste_possible([])
 
-       self.PourEtreCoche=self.listeValeursCourantes
+       maListe=[]
+       for  i in self.listeAAfficher: maListe.append(i)  
+       if self.alpha==1 : maListe.sort()
+       if len(self.listeAAfficher)*20 > 400 : self.setMinimumHeight(400)
+       else : self.setMinimumHeight(len(self.listeAAfficher)*30)
+
+
+       self.PourEtreCoche=[]
        if self.objSimp.wait_assd() : 
           self.listeAAfficher=self.node.item.get_sd_avant_du_bon_type()
-          self.PourEtreCoche=[]
           for concept in self.listeValeursCourantes:
               self.PourEtreCoche.append(concept.nom)
-       if len(self.listeAAfficher)*20 > 400 : self.setMinimumHeight(400)
-       else : self.setMinimumHeight(len(self.listeAAfficher)*30)
-       self.adjustSize()
-       self.vScrollBar = self.scrollArea.verticalScrollBar()
-       self.politique=PolitiquePlusieurs(self.node,self.editor)
-       self.indexListe=1
-       for i in range(1,len(self.listeAAfficher)+1): self.ajoutCB(i)
-       for i in range(len(self.listeAAfficher)):
+       else :
+          for val in self.listeValeursCourantes:
+              self.PourEtreCoche.append(val)
+       print self.PourEtreCoche
+
+       for i in range(1,len(maListe)+1): self.ajoutCB(i)
+
+       self.inhibe=True
+       for i in range(len(maListe)):
            nomCB="lineEditVal"+str(i+1)
            courant=getattr(self,nomCB)
-           courant.setText(str(self.listeAAfficher[i]))
-           #if self.monSimpDef.into[i] in self.listeValeursCourantes : 
-           if self.listeAAfficher[i] in self.PourEtreCoche : 
-              courant.setChecked(True)
+           courant.setText(str(maListe[i]))
+           if maListe[i] in self.PourEtreCoche : courant.setChecked(True)
+           else                                : courant.setChecked(False)
+
            if monEnvQT5 : courant.toggled.connect(self.changeValeur)
-           else :         self.connect(courant,SIGNAL("toggled(bool)"),self.changeValeur)
+           else         : self.connect(courant,SIGNAL("toggled(bool)"),self.changeValeur)
+       self.inhibe=False
+
        self.vScrollBar.triggerAction(QScrollBar.SliderToMinimum)
        
 
   def ajoutCB(self,index,valeur=None):
-      #print "ajoutCB ", index
       nomCB="lineEditVal"+str(index)
       if hasattr(self,nomCB) : return
       nouveauCB = QCheckBox(self.scrollArea)
-      self.CBLayout.addWidget(nouveauCB)
-      QApplication.processEvents()
+      #self.CBLayout.addWidget(nouveauCB)
+      self.CBLayout.insertWidget(index-1,nouveauCB)
+      #QApplication.processEvents()
+      self.listeCB.append(nouveauCB)
       nouveauCB.setText("")
       if index % 2 == 1 : nouveauCB.setStyleSheet("background:rgb(210,210,210)")
       else :                       nouveauCB.setStyleSheet("background:rgb(240,240,240)")
@@ -139,10 +169,6 @@ class MonWidgetPlusieursInto (Ui_WidgetPlusieursInto,Feuille,GerePlie):
         return self.finCommentaireListe() 
 
   def ajout1Valeur(self,valeur=None):
-        #print "________________"
-        #print self
-        #print self.node
-        #print self.node.item
         if valeur == None : return
         liste,validite=SaisieValeur.TraiteLEValeur(self,str(valeur))
         if validite == 0 : return
@@ -153,8 +179,6 @@ class MonWidgetPlusieursInto (Ui_WidgetPlusieursInto,Feuille,GerePlie):
         if (comm2 != "" and comm != None) : return comm2
         if validite : 
            self.listeValeursCourantes=self.listeValeursCourantes+listeRetour
-           if len(self.listeValeursCourantes) > self.monSimpDef.min :
-              self.node.item.set_valeur(self.listeValeursCourantes)
            return None
         else :
            return(comm2+" "+comm)
@@ -162,9 +186,11 @@ class MonWidgetPlusieursInto (Ui_WidgetPlusieursInto,Feuille,GerePlie):
 
 
   def changeValeur(self):
+      if self.inhibe == True: return
+      self.noircirResultatFiltre()
       self.listeValeursCourantesAvant=self.listeValeursCourantes
       self.listeValeursCourantes = []
-      #print "changeValeur ____________" , self.monSimpDef.into, len(self.monSimpDef.into)
+
       for i in range (1,len(self.listeAAfficher)+1):
           nomLineEdit="lineEditVal"+str(i)
           courant=getattr(self,nomLineEdit)
@@ -172,20 +198,40 @@ class MonWidgetPlusieursInto (Ui_WidgetPlusieursInto,Feuille,GerePlie):
           valeur=courant.text()
           if valeur != None and valeur != "" : 
              commentaire=self.ajout1Valeur(valeur)
-             if (commentaire != None ):
+             if (commentaire != None ): 
                  self.editor.affiche_infos(commentaire,Qt.red)
+                 self.listeValeursCourantesAvant=self.listeValeursCourantes
+                 self.setValeurs()
+
       min,max = self.node.item.GetMinMax()
       if len(self.listeValeursCourantes) < min : 
          self.editor.affiche_infos(tr("Nombre minimal de valeurs : ") + str(min),Qt.red)
       elif len(self.listeValeursCourantes) > max : 
          self.editor.affiche_infos(tr("Nombre maximal de valeurs : ") + str(max),Qt.red)
-      if self.listeValeursCourantes== [] : self.listeValeursCourantes=None
-      self.node.item.set_valeur(self.listeValeursCourantes)
-      if self.listeValeursCourantes != None and (len(self.listeValeursCourantes) != len(self.monSimpDef.into)) : 
-         self.inhibe=True
-         self.CBCheck.setChecked(True)
-         self.inhibe=False
+
+      if self.listeValeursCourantes== [] :  self.node.item.set_valeur(None)
+      else : self.node.item.set_valeur(self.listeValeursCourantes)
+
       self.setValide()
       self.reaffiche()
 
 
+  def prepareListeResultatFiltre(self):
+      filtre=str(self.LEFiltre.text())
+      for cb in self.listeCB:
+          texte=cb.text() 
+          if texte.find(filtre) == 0 :
+            palette = QPalette(Qt.red)
+           palette.setColor(QPalette.WindowText,Qt.red)
+           cb.setPalette(palette)
+            t=cb.text()
+            cb.setText(t)
+            self.listeCbRouge.append(cb)
+
+  def prepareListeResultat(self):
+      self.clearAll()
+      self.setValeurs()
+
+  def clearAll(self):
+      for cb in self.listeCB :
+         cb.setText("")
index 302f0cc258ab23257c97b76745dd2abf2057ea07..3d4934bfc484e59ad3a4dc052984bacfec934ebf 100644 (file)
@@ -40,7 +40,6 @@ from gereListe             import GereListe
 from gereListe             import LECustom
 from Tuple2                import Ui_Tuple2
 from Tuple3                import Ui_Tuple3
-from maMessageBox         import maMessageBox
 
 
 class TupleCustom :
@@ -339,4 +338,13 @@ class MonWidgetPlusieursTuple(Feuille,GereListe):
               except :
                pass
          self.node.item.set_valeur(val)
+      if self.objSimp.definition.validators.typeDesTuples[0]==self.editor.readercata.cata[0].sd_moteur :
+         val=[]
+         for k in self.objSimp.jdc.MotorDico.keys() :
+              try :
+               valeur=self.objSimp.jdc.get_concept(k)
+               val.append((valeur,0))
+              except :
+               pass
+         self.node.item.set_valeur(val)
 
index 8566a09751d5cf5aa7f0a69f01212ab325618806..4d281f76938290535bb30298c9716e70d251c3dc 100755 (executable)
@@ -186,18 +186,18 @@ class Appli(Ui_Eficas,QMainWindow):
 
 
     def ajoutExecution(self):
-        self.menuExecution = self.menubar.addMenu(QApplication.translate("Eficas", "Execution", None, QApplication.UnicodeUTF8))
+        self.menuExecution = self.menubar.addMenu(tr("Execution"))
         self.actionExecution = QAction(self)
         if sys.platform[0:5]=="linux":
           icon6 = QIcon(self.repIcon+"/roue.png")
           self.actionExecution.setIcon(icon6)
         else :
-          self.actionExecution.setText(QApplication.translate("Eficas", "Run", None))
+          self.actionExecution.setText(tr("Run"))
         self.actionExecution.setObjectName("actionExecution")
         self.menuExecution.addAction(self.actionExecution)
         if not(self.actionExecution in self.toolBar.actions()):
            self.toolBar.addAction(self.actionExecution)
-        self.actionExecution.setText(QApplication.translate("Eficas", "Execution ", None, QApplication.UnicodeUTF8))
+        self.actionExecution.setText(tr("Execution"))
         if monEnvQT5 : self.actionExecution.triggered.connect(self.run)
         else         : self.connect(self.actionExecution,SIGNAL("triggered()"),self.run)
 
@@ -209,7 +209,7 @@ class Appli(Ui_Eficas,QMainWindow):
         self.menuExecution.addAction(self.actionSaveRun)
         if not(self.actionSaveRun in self.toolBar.actions()):
            self.toolBar.addAction(self.actionSaveRun)
-        self.actionSaveRun.setText(QApplication.translate("Eficas", "Save Run", None, QApplication.UnicodeUTF8))
+        self.actionSaveRun.setText(tr("Save Run"))
         if monEnvQT5 : self.actionSaveRun.triggered.connect(self.saveRun)
         else         : self.connect(self.actionSaveRun,SIGNAL("triggered()"),self.saveRun)
 
@@ -523,7 +523,7 @@ class Appli(Ui_Eficas,QMainWindow):
            self.menuPatrons = QMenu(self.menubar)
            self.menuPatrons.setObjectName("menuPatrons")
            self.menubar.addAction(self.menuPatrons.menuAction())
-           self.menuPatrons.setTitle(QApplication.translate("Eficas", "Patrons", None, QApplication.UnicodeUTF8))
+           self.menuPatrons.setTitle(tr("Patrons"))
         else :
            self.menuPatrons.clear()
         self.listePatrons = listePatrons.listePatrons(self.code)
index be870312e2eb761985ea36fa1686016603f56ed1..82f67770069f6c09251c1302af340147a55ef81a 100644 (file)
@@ -383,6 +383,7 @@ class MyTabview:
                 tr("&Sauvegarder"),
                 tr(texte),
                 tr("&Quitter sans sauvegarder") )
+              if res == 2 : res = 1
             if res == 0:
                 (ok, newName) = editor.saveFile()
                 if ok:
index e5182e8fbbca79fd640529a9a6034fea12d51a71..48ed0f90411d36739e16c715b0db178d2f27acf5 100644 (file)
@@ -43,7 +43,9 @@ eficas_compile_ui ( desViewRegles.ui )
 eficas_compile_ui ( desVisu.ui )
 eficas_compile_ui ( desWidgetCreeParam.ui )
 eficas_compile_ui ( desWidgetCommande.ui )
+eficas_compile_ui ( desWidgetFormule.ui )
 eficas_compile_ui ( desWidgetOptionnel.ui )
+eficas_compile_ui ( desGroupeOptionnel.ui )
 eficas_compile_ui ( Tuple2.ui )
 eficas_compile_ui ( Tuple3.ui )
 #
index 49e7469337783db39ad9c1b18caad9e9b6b2a588..43289173739015395cc57b52d482a165c21a3f32 100644 (file)
   <property name="styleSheet">
    <string notr="true"/>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="spacing">
-    <number>3</number>
-   </property>
+  <layout class="QGridLayout" name="gridLayout">
    <property name="margin">
     <number>0</number>
    </property>
-   <item>
+   <item row="0" column="0">
     <widget class="QSplitter" name="splitter">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
+     <property name="handleWidth">
+      <number>3</number>
+     </property>
      <widget class="QWidget" name="widgetTree" native="true">
       <property name="styleSheet">
        <string notr="true">background:rgb(247,247,247);
@@ -61,7 +61,7 @@
      </widget>
     </widget>
    </item>
-   <item>
+   <item row="1" column="0">
     <widget class="QLabel" name="labelCommentaire">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
index 47c13539735faa5dc4e2a947c8a6437ae517cdc2..e8c9904001ab11b7616768a9c162c360df69bb60 100644 (file)
    <string notr="true">background-color : rgb(248,247,246)</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_4">
+   <property name="spacing">
+    <number>0</number>
+   </property>
+   <property name="leftMargin">
+    <number>2</number>
+   </property>
+   <property name="topMargin">
+    <number>2</number>
+   </property>
+   <property name="rightMargin">
+    <number>2</number>
+   </property>
+   <property name="bottomMargin">
+    <number>2</number>
+   </property>
    <item>
     <widget class="QFrame" name="frameAffichage">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
       <enum>QFrame::Raised</enum>
      </property>
      <layout class="QHBoxLayout" name="horizontalLayout_3">
+      <property name="spacing">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
       <item>
        <layout class="QVBoxLayout" name="verticalLayout_2">
         <property name="spacing">
       <item>
        <layout class="QVBoxLayout" name="verticalLayout_3">
         <property name="spacing">
-         <number>0</number>
+         <number>5</number>
         </property>
         <item>
          <widget class="QLabel" name="textLabel6">
           <property name="sizePolicy">
-           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           <property name="minimumSize">
            <size>
             <width>141</width>
-            <height>35</height>
+            <height>25</height>
            </size>
           </property>
           <property name="maximumSize">
            <size>
             <width>16777215</width>
-            <height>35</height>
+            <height>25</height>
            </size>
           </property>
           <property name="toolTip">
           </property>
          </widget>
         </item>
+        <item>
+         <spacer name="verticalSpacer_2">
+          <property name="orientation">
+           <enum>Qt::Vertical</enum>
+          </property>
+          <property name="sizeType">
+           <enum>QSizePolicy::Fixed</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>20</width>
+            <height>2</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
         <item>
          <widget class="QLineEdit" name="LEFiltre">
           <property name="sizePolicy">
         </item>
         <item>
          <layout class="QHBoxLayout" name="horizontalLayout_2">
+          <property name="sizeConstraint">
+           <enum>QLayout::SetMinimumSize</enum>
+          </property>
           <item>
            <widget class="QRadioButton" name="RBCasse">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
             <property name="text">
              <string>Sensible à la casse</string>
             </property>
             </property>
            </widget>
           </item>
+          <item>
+           <spacer name="horizontalSpacer_3">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>40</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
           <item>
            <widget class="QPushButton" name="RBClear">
             <property name="sizePolicy">
             </property>
             <property name="minimumSize">
              <size>
-              <width>200</width>
-              <height>40</height>
+              <width>100</width>
+              <height>30</height>
              </size>
             </property>
             <property name="maximumSize">
              <size>
-              <width>200</width>
+              <width>70</width>
               <height>40</height>
              </size>
             </property>
@@ -260,6 +322,9 @@ border-radius : 12px
       </item>
       <item>
        <layout class="QVBoxLayout" name="verticalLayout_5">
+        <property name="sizeConstraint">
+         <enum>QLayout::SetFixedSize</enum>
+        </property>
         <item>
          <layout class="QHBoxLayout" name="horizontalLayout">
           <item>
@@ -346,11 +411,32 @@ border-radius : 12px
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>1226</width>
-        <height>498</height>
+        <width>1240</width>
+        <height>518</height>
        </rect>
       </property>
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
       <layout class="QVBoxLayout" name="verticalLayout">
+       <property name="spacing">
+        <number>0</number>
+       </property>
+       <property name="leftMargin">
+        <number>0</number>
+       </property>
+       <property name="topMargin">
+        <number>2</number>
+       </property>
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
+        <number>0</number>
+       </property>
        <item>
         <layout class="QVBoxLayout" name="commandesLayout">
          <property name="spacing">
diff --git a/UiQT4/desGroupeOptionnel.ui b/UiQT4/desGroupeOptionnel.ui
new file mode 100644 (file)
index 0000000..217e1fb
--- /dev/null
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>groupeOptionnel</class>
+ <widget class="QWidget" name="groupeOptionnel">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QFrame" name="frame_2">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="frameShape">
+      <enum>QFrame::Box</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Raised</enum>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <item>
+       <widget class="QLabel" name="MCLabel">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>0</width>
+          <height>31</height>
+         </size>
+        </property>
+        <property name="frameShape">
+         <enum>QFrame::NoFrame</enum>
+        </property>
+        <property name="frameShadow">
+         <enum>QFrame::Raised</enum>
+        </property>
+        <property name="text">
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#0000ff;&quot;&gt;commande &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer name="horizontalSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>1037</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QScrollArea" name="scrollAreaCommandesOptionnelles">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="styleSheet">
+      <string notr="true">background : rgb(247,247,247)</string>
+     </property>
+     <property name="frameShape">
+      <enum>QFrame::NoFrame</enum>
+     </property>
+     <property name="lineWidth">
+      <number>0</number>
+     </property>
+     <property name="widgetResizable">
+      <bool>true</bool>
+     </property>
+     <widget class="QWidget" name="MCOptionnelLW">
+      <property name="geometry">
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>382</width>
+        <height>223</height>
+       </rect>
+      </property>
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <layout class="QVBoxLayout" name="MCOptionnelLayout">
+       <item>
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>75</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
index a48c8947130f3d1acb97d8238fb9acf7712089a7..ac31d2d3b5c4582f80df8fad812a320bd2a7969a 100644 (file)
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1031</width>
-    <height>250</height>
+    <width>1290</width>
+    <height>540</height>
    </rect>
   </property>
   <property name="sizePolicy">
    <string notr="true">background-color : rgb(224,223,222);
 font : 'times' 9px</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_3">
+  <layout class="QVBoxLayout" name="verticalLayout_4">
+   <property name="spacing">
+    <number>0</number>
+   </property>
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_4">
-     <item>
-      <widget class="QFrame" name="frame_2">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="frameShape">
-        <enum>QFrame::Box</enum>
-       </property>
-       <property name="frameShadow">
-        <enum>QFrame::Raised</enum>
-       </property>
-       <layout class="QHBoxLayout" name="horizontalLayout">
-        <property name="spacing">
-         <number>0</number>
-        </property>
-        <item>
-         <spacer name="horizontalSpacer_5">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Fixed</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>13</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class="MonBoutonValide" name="RBValide">
-          <property name="minimumSize">
-           <size>
-            <width>17</width>
-            <height>31</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>21</width>
-            <height>31</height>
-           </size>
-          </property>
-          <property name="focusPolicy">
-           <enum>Qt::ClickFocus</enum>
-          </property>
-          <property name="toolTip">
-           <string>Affiche le rapport de validité de la commande</string>
-          </property>
-          <property name="styleSheet">
-           <string notr="true">border : 0px</string>
-          </property>
-          <property name="text">
-           <string>...</string>
-          </property>
-          <property name="icon">
-           <iconset>
-            <normaloff>../Editeur/icons/ast-green-ball.png</normaloff>../Editeur/icons/ast-green-ball.png</iconset>
-          </property>
-          <property name="iconSize">
-           <size>
-            <width>21</width>
-            <height>31</height>
-           </size>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer name="horizontalSpacer_3">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Fixed</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>13</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class="MonLabelClic" name="labelNomCommande">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>150</width>
-            <height>31</height>
-           </size>
-          </property>
-          <property name="frameShape">
-           <enum>QFrame::NoFrame</enum>
-          </property>
-          <property name="frameShadow">
-           <enum>QFrame::Raised</enum>
-          </property>
-          <property name="text">
-           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#0000ff;&quot;&gt;commande &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer name="toto">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Maximum</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>2</width>
-            <height>40</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
+    <widget class="QFrame" name="frameAffichage">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>130</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>130</height>
+      </size>
+     </property>
+     <property name="styleSheet">
+      <string notr="true">background-color:rgb(224,223,222)</string>
+     </property>
+     <property name="frameShape">
+      <enum>QFrame::NoFrame</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Raised</enum>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout_5">
+      <property name="spacing">
+       <number>0</number>
+      </property>
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout_4">
         <item>
-         <widget class="QLineEdit" name="LENom">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="toolTip">
-           <string>Nom de l'objet. Seuls, les objets valides peuvent être nommés</string>
-          </property>
-          <property name="styleSheet">
-           <string notr="true"> QLineEdit {
+         <layout class="QVBoxLayout" name="verticalLayout_3">
+          <item>
+           <widget class="QFrame" name="frame_2">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="frameShape">
+             <enum>QFrame::Box</enum>
+            </property>
+            <property name="frameShadow">
+             <enum>QFrame::Raised</enum>
+            </property>
+            <layout class="QHBoxLayout" name="horizontalLayout">
+             <property name="spacing">
+              <number>0</number>
+             </property>
+             <item>
+              <spacer name="horizontalSpacer_5">
+               <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+               </property>
+               <property name="sizeType">
+                <enum>QSizePolicy::Fixed</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>13</width>
+                 <height>20</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
+             <item>
+              <widget class="MonBoutonValide" name="RBValide">
+               <property name="minimumSize">
+                <size>
+                 <width>17</width>
+                 <height>31</height>
+                </size>
+               </property>
+               <property name="maximumSize">
+                <size>
+                 <width>21</width>
+                 <height>31</height>
+                </size>
+               </property>
+               <property name="focusPolicy">
+                <enum>Qt::ClickFocus</enum>
+               </property>
+               <property name="toolTip">
+                <string>Affiche le rapport de validité de la commande</string>
+               </property>
+               <property name="styleSheet">
+                <string notr="true">border : 0px</string>
+               </property>
+               <property name="text">
+                <string>...</string>
+               </property>
+               <property name="icon">
+                <iconset>
+                 <normaloff>../Editeur/icons/ast-green-ball.png</normaloff>../Editeur/icons/ast-green-ball.png</iconset>
+               </property>
+               <property name="iconSize">
+                <size>
+                 <width>21</width>
+                 <height>31</height>
+                </size>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <spacer name="horizontalSpacer_3">
+               <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+               </property>
+               <property name="sizeType">
+                <enum>QSizePolicy::Fixed</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>13</width>
+                 <height>20</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
+             <item>
+              <widget class="MonLabelClic" name="labelNomCommande">
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+               <property name="minimumSize">
+                <size>
+                 <width>150</width>
+                 <height>31</height>
+                </size>
+               </property>
+               <property name="frameShape">
+                <enum>QFrame::NoFrame</enum>
+               </property>
+               <property name="frameShadow">
+                <enum>QFrame::Raised</enum>
+               </property>
+               <property name="text">
+                <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#0000ff;&quot;&gt;commande &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <spacer name="toto">
+               <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+               </property>
+               <property name="sizeType">
+                <enum>QSizePolicy::Maximum</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>2</width>
+                 <height>40</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
+             <item>
+              <widget class="QLineEdit" name="LENom">
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+               <property name="toolTip">
+                <string>Nom de l'objet. Seuls, les objets valides peuvent être nommés</string>
+               </property>
+               <property name="styleSheet">
+                <string notr="true"> QLineEdit {
      border: 2px solid gray;
      border-radius: 10px;
      padding: 0 8px;
@@ -189,123 +251,258 @@ QLineEdit:disabled
 }
 /*read-only {
      background: lightblue;*/</string>
-          </property>
-          <property name="readOnly">
-           <bool>false</bool>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer name="horizontalSpacer_2">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Ignored</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>2</width>
-            <height>40</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <layout class="QHBoxLayout" name="horizontalLayout_2">
-          <property name="spacing">
-           <number>4</number>
-          </property>
-          <property name="sizeConstraint">
-           <enum>QLayout::SetFixedSize</enum>
-          </property>
-          <item>
-           <widget class="QToolButton" name="RBRun">
-            <property name="minimumSize">
-             <size>
-              <width>21</width>
-              <height>31</height>
-             </size>
-            </property>
-            <property name="maximumSize">
-             <size>
-              <width>21</width>
-              <height>31</height>
-             </size>
-            </property>
-            <property name="focusPolicy">
-             <enum>Qt::ClickFocus</enum>
-            </property>
-            <property name="toolTip">
-             <string>Lance un script associé à la commande</string>
-            </property>
-            <property name="styleSheet">
-             <string notr="true">border : 0px</string>
-            </property>
-            <property name="text">
-             <string>...</string>
-            </property>
-            <property name="icon">
-             <iconset>
-              <normaloff>../Editeur/icons/roue.png</normaloff>../Editeur/icons/roue.png</iconset>
-            </property>
-            <property name="iconSize">
-             <size>
-              <width>21</width>
-              <height>31</height>
-             </size>
-            </property>
+               </property>
+               <property name="readOnly">
+                <bool>false</bool>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <spacer name="horizontalSpacer_7">
+               <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>108</width>
+                 <height>20</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
+             <item>
+              <spacer name="horizontalSpacer_2">
+               <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+               </property>
+               <property name="sizeType">
+                <enum>QSizePolicy::Ignored</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>2</width>
+                 <height>40</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
+             <item>
+              <layout class="QHBoxLayout" name="horizontalLayout_2">
+               <property name="spacing">
+                <number>4</number>
+               </property>
+               <property name="sizeConstraint">
+                <enum>QLayout::SetFixedSize</enum>
+               </property>
+               <item>
+                <widget class="QToolButton" name="RBRun">
+                 <property name="minimumSize">
+                  <size>
+                   <width>21</width>
+                   <height>31</height>
+                  </size>
+                 </property>
+                 <property name="maximumSize">
+                  <size>
+                   <width>21</width>
+                   <height>31</height>
+                  </size>
+                 </property>
+                 <property name="focusPolicy">
+                  <enum>Qt::ClickFocus</enum>
+                 </property>
+                 <property name="toolTip">
+                  <string>Lance un script associé à la commande</string>
+                 </property>
+                 <property name="styleSheet">
+                  <string notr="true">border : 0px</string>
+                 </property>
+                 <property name="text">
+                  <string>...</string>
+                 </property>
+                 <property name="icon">
+                  <iconset>
+                   <normaloff>../Editeur/icons/roue.png</normaloff>../Editeur/icons/roue.png</iconset>
+                 </property>
+                 <property name="iconSize">
+                  <size>
+                   <width>21</width>
+                   <height>31</height>
+                  </size>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QToolButton" name="RBInfo">
+                 <property name="minimumSize">
+                  <size>
+                   <width>21</width>
+                   <height>31</height>
+                  </size>
+                 </property>
+                 <property name="maximumSize">
+                  <size>
+                   <width>21</width>
+                   <height>31</height>
+                  </size>
+                 </property>
+                 <property name="focusPolicy">
+                  <enum>Qt::ClickFocus</enum>
+                 </property>
+                 <property name="toolTip">
+                  <string>ouvre un navigateur sur l'aide contextuelle</string>
+                 </property>
+                 <property name="styleSheet">
+                  <string notr="true">border : 0px</string>
+                 </property>
+                 <property name="text">
+                  <string>...</string>
+                 </property>
+                 <property name="icon">
+                  <iconset>
+                   <normaloff>../Editeur/icons/point-interrogation30.png</normaloff>../Editeur/icons/point-interrogation30.png</iconset>
+                 </property>
+                 <property name="iconSize">
+                  <size>
+                   <width>21</width>
+                   <height>31</height>
+                  </size>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QToolButton" name="RBRegle">
+                 <property name="minimumSize">
+                  <size>
+                   <width>21</width>
+                   <height>31</height>
+                  </size>
+                 </property>
+                 <property name="maximumSize">
+                  <size>
+                   <width>21</width>
+                   <height>31</height>
+                  </size>
+                 </property>
+                 <property name="focusPolicy">
+                  <enum>Qt::ClickFocus</enum>
+                 </property>
+                 <property name="toolTip">
+                  <string>affiche les régles de validité</string>
+                 </property>
+                 <property name="styleSheet">
+                  <string notr="true">border : 0px</string>
+                 </property>
+                 <property name="text">
+                  <string>...</string>
+                 </property>
+                 <property name="icon">
+                  <iconset>
+                   <normaloff>../Editeur/icons/lettreRblanc30.png</normaloff>../Editeur/icons/lettreRblanc30.png</iconset>
+                 </property>
+                 <property name="iconSize">
+                  <size>
+                   <width>21</width>
+                   <height>31</height>
+                  </size>
+                 </property>
+                </widget>
+               </item>
+              </layout>
+             </item>
+             <item>
+              <spacer name="horizontalSpacer_4">
+               <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+               </property>
+               <property name="sizeType">
+                <enum>QSizePolicy::Fixed</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>13</width>
+                 <height>20</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
+             <item>
+              <widget class="QToolButton" name="RBPoubelle">
+               <property name="minimumSize">
+                <size>
+                 <width>21</width>
+                 <height>31</height>
+                </size>
+               </property>
+               <property name="maximumSize">
+                <size>
+                 <width>21</width>
+                 <height>31</height>
+                </size>
+               </property>
+               <property name="focusPolicy">
+                <enum>Qt::ClickFocus</enum>
+               </property>
+               <property name="toolTip">
+                <string>Détruit la commande</string>
+               </property>
+               <property name="styleSheet">
+                <string notr="true">border : 0px</string>
+               </property>
+               <property name="text">
+                <string>...</string>
+               </property>
+               <property name="icon">
+                <iconset>
+                 <normaloff>../Editeur/icons/deleteRond.png</normaloff>../Editeur/icons/deleteRond.png</iconset>
+               </property>
+               <property name="iconSize">
+                <size>
+                 <width>21</width>
+                 <height>31</height>
+                </size>
+               </property>
+              </widget>
+             </item>
+            </layout>
+            <zorder>RBValide</zorder>
+            <zorder>labelNomCommande</zorder>
+            <zorder>LENom</zorder>
+            <zorder>horizontalSpacer_3</zorder>
+            <zorder>horizontalSpacer_4</zorder>
+            <zorder>RBPoubelle</zorder>
+            <zorder>horizontalSpacer_5</zorder>
+            <zorder>horizontalSpacer_7</zorder>
            </widget>
           </item>
           <item>
-           <widget class="QToolButton" name="RBInfo">
-            <property name="minimumSize">
-             <size>
-              <width>21</width>
-              <height>31</height>
-             </size>
-            </property>
-            <property name="maximumSize">
-             <size>
-              <width>21</width>
-              <height>31</height>
-             </size>
-            </property>
-            <property name="focusPolicy">
-             <enum>Qt::ClickFocus</enum>
-            </property>
-            <property name="toolTip">
-             <string>ouvre un navigateur sur l'aide contextuelle</string>
-            </property>
-            <property name="styleSheet">
-             <string notr="true">border : 0px</string>
-            </property>
+           <widget class="QLabel" name="labelDoc">
             <property name="text">
-             <string>...</string>
-            </property>
-            <property name="icon">
-             <iconset>
-              <normaloff>../Editeur/icons/point-interrogation30.png</normaloff>../Editeur/icons/point-interrogation30.png</iconset>
-            </property>
-            <property name="iconSize">
-             <size>
-              <width>21</width>
-              <height>31</height>
-             </size>
+             <string>TextLabel</string>
             </property>
            </widget>
           </item>
+         </layout>
+        </item>
+        <item>
+         <layout class="QVBoxLayout" name="verticalLayout_2">
+          <property name="spacing">
+           <number>8</number>
+          </property>
+          <property name="topMargin">
+           <number>15</number>
+          </property>
           <item>
-           <widget class="QToolButton" name="RBRegle">
-            <property name="minimumSize">
-             <size>
-              <width>21</width>
-              <height>31</height>
-             </size>
+           <widget class="QPushButton" name="bCatalogue">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
             </property>
-            <property name="maximumSize">
+            <property name="minimumSize">
              <size>
-              <width>21</width>
+              <width>160</width>
               <height>31</height>
              </size>
             </property>
@@ -313,239 +510,129 @@ QLineEdit:disabled
              <enum>Qt::ClickFocus</enum>
             </property>
             <property name="toolTip">
-             <string>affiche les régles de validité</string>
+             <string>Affiche les commandes possibles</string>
             </property>
             <property name="styleSheet">
-             <string notr="true">border : 0px</string>
+             <string notr="true">background-color:rgb(104,110,149);
+color :white;
+border-radius : 12px
+</string>
             </property>
             <property name="text">
-             <string>...</string>
+             <string>&amp;Commandes</string>
             </property>
-            <property name="icon">
-             <iconset>
-              <normaloff>../Editeur/icons/lettreRblanc30.png</normaloff>../Editeur/icons/lettreRblanc30.png</iconset>
+            <property name="shortcut">
+             <string>Shift+A, Alt+A, Alt+A, Alt+A</string>
             </property>
-            <property name="iconSize">
-             <size>
-              <width>21</width>
-              <height>31</height>
-             </size>
+            <property name="autoDefault">
+             <bool>true</bool>
+            </property>
+            <property name="default">
+             <bool>true</bool>
             </property>
            </widget>
           </item>
-         </layout>
-        </item>
-        <item>
-         <spacer name="horizontalSpacer_4">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Fixed</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>13</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class="QToolButton" name="RBPoubelle">
-          <property name="minimumSize">
-           <size>
-            <width>21</width>
-            <height>31</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>21</width>
-            <height>31</height>
-           </size>
-          </property>
-          <property name="focusPolicy">
-           <enum>Qt::ClickFocus</enum>
-          </property>
-          <property name="toolTip">
-           <string>Détruit la commande</string>
-          </property>
-          <property name="styleSheet">
-           <string notr="true">border : 0px</string>
-          </property>
-          <property name="text">
-           <string>...</string>
-          </property>
-          <property name="icon">
-           <iconset>
-            <normaloff>../Editeur/icons/deleteRond.png</normaloff>../Editeur/icons/deleteRond.png</iconset>
-          </property>
-          <property name="iconSize">
-           <size>
-            <width>21</width>
-            <height>31</height>
-           </size>
-          </property>
-         </widget>
-        </item>
-       </layout>
-       <zorder>RBValide</zorder>
-       <zorder>labelNomCommande</zorder>
-       <zorder>LENom</zorder>
-       <zorder>horizontalSpacer_3</zorder>
-       <zorder>horizontalSpacer_4</zorder>
-       <zorder>RBPoubelle</zorder>
-       <zorder>horizontalSpacer_5</zorder>
-      </widget>
-     </item>
-     <item>
-      <layout class="QVBoxLayout" name="verticalLayout_2">
-       <item>
-        <widget class="QPushButton" name="bCatalogue">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>160</width>
-           <height>31</height>
-          </size>
-         </property>
-         <property name="focusPolicy">
-          <enum>Qt::ClickFocus</enum>
-         </property>
-         <property name="toolTip">
-          <string>Affiche les commandes possibles</string>
-         </property>
-         <property name="styleSheet">
-          <string notr="true">background-color:rgb(104,110,149);
-color :white;
-border-radius : 12px
-</string>
-         </property>
-         <property name="text">
-          <string>&amp;Commandes</string>
-         </property>
-         <property name="shortcut">
-          <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>
-        </widget>
-       </item>
-       <item>
-        <layout class="QHBoxLayout" name="horizontalLayout_3">
-         <item>
-          <widget class="QPushButton" name="bAvant">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>60</width>
-             <height>24</height>
-            </size>
-           </property>
-           <property name="maximumSize">
-            <size>
-             <width>60</width>
-             <height>24</height>
-            </size>
-           </property>
-           <property name="focusPolicy">
-            <enum>Qt::ClickFocus</enum>
-           </property>
-           <property name="toolTip">
-            <string>Affiche le formulaire de la commande précédente</string>
-           </property>
-           <property name="styleSheet">
-            <string notr="true">background-color:rgb(104,110,149);
+          <item>
+           <layout class="QHBoxLayout" name="horizontalLayout_3">
+            <item>
+             <widget class="QPushButton" name="bAvant">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="minimumSize">
+               <size>
+                <width>60</width>
+                <height>24</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>60</width>
+                <height>24</height>
+               </size>
+              </property>
+              <property name="focusPolicy">
+               <enum>Qt::ClickFocus</enum>
+              </property>
+              <property name="toolTip">
+               <string>Affiche le formulaire de la commande précédente</string>
+              </property>
+              <property name="styleSheet">
+               <string notr="true">background-color:rgb(104,110,149);
 color :white;
 border-radius : 12px
 </string>
-           </property>
-           <property name="text">
-            <string>&lt;&lt;</string>
-           </property>
-           <property name="shortcut">
-            <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>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="bApres">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>60</width>
-             <height>24</height>
-            </size>
-           </property>
-           <property name="maximumSize">
-            <size>
-             <width>60</width>
-             <height>24</height>
-            </size>
-           </property>
-           <property name="focusPolicy">
-            <enum>Qt::ClickFocus</enum>
-           </property>
-           <property name="toolTip">
-            <string>Affiche le formulaire de la commande suivante</string>
-           </property>
-           <property name="styleSheet">
-            <string notr="true">background-color:rgb(104,110,149);
+              </property>
+              <property name="text">
+               <string>&lt;&lt;</string>
+              </property>
+              <property name="shortcut">
+               <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>
+             </widget>
+            </item>
+            <item>
+             <widget class="QPushButton" name="bApres">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="minimumSize">
+               <size>
+                <width>60</width>
+                <height>24</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>60</width>
+                <height>24</height>
+               </size>
+              </property>
+              <property name="focusPolicy">
+               <enum>Qt::ClickFocus</enum>
+              </property>
+              <property name="toolTip">
+               <string>Affiche le formulaire de la commande suivante</string>
+              </property>
+              <property name="styleSheet">
+               <string notr="true">background-color:rgb(104,110,149);
 color :white;
 border-radius : 12px
 </string>
-           </property>
-           <property name="text">
-            <string>&gt;&gt;</string>
-           </property>
-           <property name="shortcut">
-            <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>
-          </widget>
-         </item>
-        </layout>
-       </item>
-      </layout>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="QLabel" name="labelDoc">
-     <property name="text">
-      <string>TextLabel</string>
-     </property>
+              </property>
+              <property name="text">
+               <string>&gt;&gt;</string>
+              </property>
+              <property name="shortcut">
+               <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>
+             </widget>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </item>
+     </layout>
     </widget>
    </item>
    <item>
@@ -579,8 +666,8 @@ border-radius : 12px
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>1013</width>
-        <height>129</height>
+        <width>1290</width>
+        <height>410</height>
        </rect>
       </property>
       <layout class="QVBoxLayout" name="verticalLayout">
@@ -624,6 +711,9 @@ border-radius : 12px
    <header>monLabelClic.h</header>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>LENom</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>
index c6946972aac6c299f3a0650f06d16a8839c8e2cb..6a452e8b0e16e1bea5300ff55d57e4e17cfda888 100644 (file)
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1031</width>
-    <height>177</height>
+    <width>847</width>
+    <height>453</height>
    </rect>
   </property>
   <property name="sizePolicy">
    <string notr="true">background-color : rgb(224,223,222);
 font : 'times' 9px</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_3">
+  <layout class="QVBoxLayout" name="verticalLayout_2">
    <property name="spacing">
     <number>0</number>
    </property>
-   <property name="margin">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
     <number>0</number>
    </property>
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_2">
-     <item>
-      <widget class="QFrame" name="frame_2">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="frameShape">
-        <enum>QFrame::Box</enum>
-       </property>
-       <property name="frameShadow">
-        <enum>QFrame::Raised</enum>
-       </property>
-       <layout class="QHBoxLayout" name="horizontalLayout">
-        <item>
-         <spacer name="horizontalSpacer_5">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Fixed</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>13</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class="MonBoutonValide" name="RBValide">
-          <property name="minimumSize">
-           <size>
-            <width>17</width>
-            <height>31</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>21</width>
-            <height>31</height>
-           </size>
-          </property>
-          <property name="toolTip">
-           <string/>
-          </property>
-          <property name="styleSheet">
-           <string notr="true">border : 0px</string>
-          </property>
-          <property name="text">
-           <string>...</string>
-          </property>
-          <property name="icon">
-           <iconset>
-            <normaloff>../Editeur/icons/ast-green-ball.png</normaloff>../Editeur/icons/ast-green-ball.png</iconset>
-          </property>
-          <property name="iconSize">
-           <size>
-            <width>21</width>
-            <height>31</height>
-           </size>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer name="horizontalSpacer_3">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Fixed</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>13</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class="QLabel" name="labelNomCommande">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>150</width>
-            <height>31</height>
-           </size>
-          </property>
-          <property name="frameShape">
-           <enum>QFrame::NoFrame</enum>
-          </property>
-          <property name="frameShadow">
-           <enum>QFrame::Raised</enum>
-          </property>
-          <property name="text">
-           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#0000ff;&quot;&gt;Commentaire&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-          </property>
-         </widget>
-        </item>
+    <widget class="QFrame" name="frameAffichage">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>130</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>130</height>
+      </size>
+     </property>
+     <property name="styleSheet">
+      <string notr="true">background-color:rgb(224,223,222)</string>
+     </property>
+     <property name="frameShape">
+      <enum>QFrame::NoFrame</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Raised</enum>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout_7">
+      <property name="spacing">
+       <number>0</number>
+      </property>
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout_9">
+        <property name="spacing">
+         <number>6</number>
+        </property>
         <item>
-         <spacer name="horizontalSpacer_2">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Maximum</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>78</width>
-            <height>40</height>
-           </size>
-          </property>
-         </spacer>
+         <layout class="QVBoxLayout" name="verticalLayout_3">
+          <item>
+           <widget class="QFrame" name="frame_4">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="frameShape">
+             <enum>QFrame::Box</enum>
+            </property>
+            <property name="frameShadow">
+             <enum>QFrame::Raised</enum>
+            </property>
+            <layout class="QHBoxLayout" name="horizontalLayout_10">
+             <property name="spacing">
+              <number>0</number>
+             </property>
+             <item>
+              <spacer name="horizontalSpacer_7">
+               <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+               </property>
+               <property name="sizeType">
+                <enum>QSizePolicy::Fixed</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>13</width>
+                 <height>20</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
+             <item>
+              <widget class="MonBoutonValide" name="RBValide">
+               <property name="minimumSize">
+                <size>
+                 <width>17</width>
+                 <height>31</height>
+                </size>
+               </property>
+               <property name="maximumSize">
+                <size>
+                 <width>21</width>
+                 <height>31</height>
+                </size>
+               </property>
+               <property name="focusPolicy">
+                <enum>Qt::ClickFocus</enum>
+               </property>
+               <property name="toolTip">
+                <string>Affiche le rapport de validité de la commande</string>
+               </property>
+               <property name="styleSheet">
+                <string notr="true">border : 0px</string>
+               </property>
+               <property name="text">
+                <string>...</string>
+               </property>
+               <property name="icon">
+                <iconset>
+                 <normaloff>../Editeur/icons/ast-green-ball.png</normaloff>../Editeur/icons/ast-green-ball.png</iconset>
+               </property>
+               <property name="iconSize">
+                <size>
+                 <width>21</width>
+                 <height>31</height>
+                </size>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <spacer name="horizontalSpacer_10">
+               <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+               </property>
+               <property name="sizeType">
+                <enum>QSizePolicy::Fixed</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>13</width>
+                 <height>20</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
+             <item>
+              <widget class="QLabel" name="labelNCommentaire">
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+               <property name="minimumSize">
+                <size>
+                 <width>150</width>
+                 <height>31</height>
+                </size>
+               </property>
+               <property name="frameShape">
+                <enum>QFrame::NoFrame</enum>
+               </property>
+               <property name="frameShadow">
+                <enum>QFrame::Raised</enum>
+               </property>
+               <property name="text">
+                <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Commentaire&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <spacer name="toto_2">
+               <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+               </property>
+               <property name="sizeType">
+                <enum>QSizePolicy::Maximum</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>2</width>
+                 <height>40</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
+             <item>
+              <spacer name="horizontalSpacer_11">
+               <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+               </property>
+               <property name="sizeType">
+                <enum>QSizePolicy::Ignored</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>2</width>
+                 <height>40</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
+             <item>
+              <spacer name="horizontalSpacer_12">
+               <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+               </property>
+               <property name="sizeType">
+                <enum>QSizePolicy::Fixed</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>13</width>
+                 <height>20</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
+             <item>
+              <widget class="QToolButton" name="RBPoubelle">
+               <property name="minimumSize">
+                <size>
+                 <width>21</width>
+                 <height>31</height>
+                </size>
+               </property>
+               <property name="maximumSize">
+                <size>
+                 <width>21</width>
+                 <height>31</height>
+                </size>
+               </property>
+               <property name="focusPolicy">
+                <enum>Qt::ClickFocus</enum>
+               </property>
+               <property name="toolTip">
+                <string>Détruit la commande</string>
+               </property>
+               <property name="styleSheet">
+                <string notr="true">border : 0px</string>
+               </property>
+               <property name="text">
+                <string>...</string>
+               </property>
+               <property name="icon">
+                <iconset>
+                 <normaloff>../Editeur/icons/deleteRond.png</normaloff>../Editeur/icons/deleteRond.png</iconset>
+               </property>
+               <property name="iconSize">
+                <size>
+                 <width>21</width>
+                 <height>31</height>
+                </size>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
+         </layout>
         </item>
         <item>
-         <widget class="QToolButton" name="RBPoubelle">
-          <property name="minimumSize">
-           <size>
-            <width>21</width>
-            <height>31</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>21</width>
-            <height>31</height>
-           </size>
-          </property>
-          <property name="toolTip">
-           <string>Détruit le commentaire</string>
-          </property>
-          <property name="styleSheet">
-           <string notr="true">border : 0px</string>
-          </property>
-          <property name="text">
-           <string>...</string>
+         <layout class="QVBoxLayout" name="verticalLayout_6">
+          <property name="spacing">
+           <number>8</number>
           </property>
-          <property name="icon">
-           <iconset>
-            <normaloff>../Editeur/icons/deleteRond.png</normaloff>../Editeur/icons/deleteRond.png</iconset>
+          <property name="topMargin">
+           <number>15</number>
           </property>
-          <property name="iconSize">
-           <size>
-            <width>21</width>
-            <height>31</height>
-           </size>
-          </property>
-         </widget>
-        </item>
-       </layout>
-       <zorder>RBValide</zorder>
-       <zorder>labelNomCommande</zorder>
-       <zorder>horizontalSpacer_3</zorder>
-       <zorder>RBPoubelle</zorder>
-       <zorder>horizontalSpacer_5</zorder>
-      </widget>
-     </item>
-     <item>
-      <layout class="QVBoxLayout" name="verticalLayout_2">
-       <item>
-        <widget class="QPushButton" name="bCatalogue">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>160</width>
-           <height>31</height>
-          </size>
-         </property>
-         <property name="toolTip">
-          <string>Affiche les commandes possibles</string>
-         </property>
-         <property name="styleSheet">
-          <string notr="true">background-color:rgb(104,110,149);
+          <item>
+           <widget class="QPushButton" name="bCatalogue">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>160</width>
+              <height>31</height>
+             </size>
+            </property>
+            <property name="focusPolicy">
+             <enum>Qt::ClickFocus</enum>
+            </property>
+            <property name="toolTip">
+             <string>Affiche les commandes possibles</string>
+            </property>
+            <property name="styleSheet">
+             <string notr="true">background-color:rgb(104,110,149);
 color :white;
 border-radius : 12px
 </string>
-         </property>
-         <property name="text">
-          <string>&amp;Commandes</string>
-         </property>
-         <property name="shortcut">
-          <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>
-        </widget>
-       </item>
-       <item>
-        <layout class="QHBoxLayout" name="horizontalLayout_3">
-         <item>
-          <widget class="QPushButton" name="bAvant">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>60</width>
-             <height>24</height>
-            </size>
-           </property>
-           <property name="maximumSize">
-            <size>
-             <width>60</width>
-             <height>24</height>
-            </size>
-           </property>
-           <property name="focusPolicy">
-            <enum>Qt::ClickFocus</enum>
-           </property>
-           <property name="toolTip">
-            <string>Affiche le formulaire de la commande précédente</string>
-           </property>
-           <property name="styleSheet">
-            <string notr="true">background-color:rgb(104,110,149);
+            </property>
+            <property name="text">
+             <string>&amp;Commandes</string>
+            </property>
+            <property name="shortcut">
+             <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>
+           </widget>
+          </item>
+          <item>
+           <layout class="QHBoxLayout" name="horizontalLayout_11">
+            <item>
+             <widget class="QPushButton" name="bAvant">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="minimumSize">
+               <size>
+                <width>60</width>
+                <height>24</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>60</width>
+                <height>24</height>
+               </size>
+              </property>
+              <property name="focusPolicy">
+               <enum>Qt::ClickFocus</enum>
+              </property>
+              <property name="toolTip">
+               <string>Affiche le formulaire de la commande précédente</string>
+              </property>
+              <property name="styleSheet">
+               <string notr="true">background-color:rgb(104,110,149);
 color :white;
 border-radius : 12px
 </string>
-           </property>
-           <property name="text">
-            <string>&lt;&lt;</string>
-           </property>
-           <property name="shortcut">
-            <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>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="bApres">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>60</width>
-             <height>24</height>
-            </size>
-           </property>
-           <property name="maximumSize">
-            <size>
-             <width>60</width>
-             <height>24</height>
-            </size>
-           </property>
-           <property name="focusPolicy">
-            <enum>Qt::ClickFocus</enum>
-           </property>
-           <property name="toolTip">
-            <string>Affiche le formulaire de la commande suivante</string>
-           </property>
-           <property name="styleSheet">
-            <string notr="true">background-color:rgb(104,110,149);
+              </property>
+              <property name="text">
+               <string>&lt;&lt;</string>
+              </property>
+              <property name="shortcut">
+               <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>
+             </widget>
+            </item>
+            <item>
+             <widget class="QPushButton" name="bApres">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="minimumSize">
+               <size>
+                <width>60</width>
+                <height>24</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>60</width>
+                <height>24</height>
+               </size>
+              </property>
+              <property name="focusPolicy">
+               <enum>Qt::ClickFocus</enum>
+              </property>
+              <property name="toolTip">
+               <string>Affiche le formulaire de la commande suivante</string>
+              </property>
+              <property name="styleSheet">
+               <string notr="true">background-color:rgb(104,110,149);
 color :white;
 border-radius : 12px
 </string>
-           </property>
-           <property name="text">
-            <string>&gt;&gt;</string>
-           </property>
-           <property name="shortcut">
-            <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>
-          </widget>
-         </item>
-        </layout>
-       </item>
-      </layout>
-     </item>
-    </layout>
+              </property>
+              <property name="text">
+               <string>&gt;&gt;</string>
+              </property>
+              <property name="shortcut">
+               <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>
+             </widget>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
    </item>
    <item>
     <widget class="QScrollArea" name="scrollAreaCommandes">
@@ -355,10 +461,7 @@ border-radius : 12px
       </size>
      </property>
      <property name="styleSheet">
-      <string notr="true">
-
-
-</string>
+      <string notr="true"/>
      </property>
      <property name="frameShape">
       <enum>QFrame::NoFrame</enum>
@@ -374,43 +477,31 @@ border-radius : 12px
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>1031</width>
-        <height>110</height>
+        <width>847</width>
+        <height>323</height>
        </rect>
       </property>
       <layout class="QVBoxLayout" name="verticalLayout">
+       <property name="spacing">
+        <number>0</number>
+       </property>
        <property name="leftMargin">
+        <number>4</number>
+       </property>
+       <property name="topMargin">
         <number>0</number>
        </property>
        <property name="rightMargin">
+        <number>4</number>
+       </property>
+       <property name="bottomMargin">
         <number>0</number>
        </property>
        <item>
-        <widget class="QLineEdit" name="commentaireLE">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>0</width>
-           <height>43</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>16777215</width>
-           <height>43</height>
-          </size>
-         </property>
+        <widget class="QTextEdit" name="commentaireTE">
          <property name="styleSheet">
           <string notr="true">background : rgb(247,247,247)</string>
          </property>
-         <property name="frame">
-          <bool>false</bool>
-         </property>
         </widget>
        </item>
        <item>
@@ -442,9 +533,6 @@ border-radius : 12px
   </customwidget>
  </customwidgets>
  <tabstops>
-  <tabstop>RBPoubelle</tabstop>
-  <tabstop>bCatalogue</tabstop>
-  <tabstop>RBValide</tabstop>
   <tabstop>scrollAreaCommandes</tabstop>
  </tabstops>
  <resources/>
index 787f61c9b356acea22e4d1f2e574f1db4e35f710..cbcdb1c3fdc5566ae83ceedd691cfd0e13bbeddf 100644 (file)
@@ -126,10 +126,13 @@ background-color: rgb(247,247,247);
         <x>30</x>
         <y>40</y>
         <width>531</width>
-        <height>70</height>
+        <height>76</height>
        </rect>
       </property>
       <layout class="QGridLayout" name="gridLayout">
+       <property name="verticalSpacing">
+        <number>12</number>
+       </property>
        <item row="1" column="1">
         <widget class="QLineEdit" name="lineEditVal">
          <property name="minimumSize">
@@ -231,6 +234,12 @@ border:0px;</string>
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>lineEditNom</tabstop>
+  <tabstop>lineEditVal</tabstop>
+  <tabstop>scrollArea</tabstop>
+  <tabstop>LBParam</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/UiQT4/desWidgetFormule.ui b/UiQT4/desWidgetFormule.ui
new file mode 100644 (file)
index 0000000..7d3647b
--- /dev/null
@@ -0,0 +1,709 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>WidgetFormule</class>
+ <widget class="QWidget" name="WidgetFormule">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>1156</width>
+    <height>689</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>0</width>
+    <height>0</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <string>DCommandeUnique</string>
+  </property>
+  <property name="toolTip">
+   <string/>
+  </property>
+  <property name="styleSheet">
+   <string notr="true">background-color : rgb(224,223,222);
+font : 'times' 9px</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_3">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_4">
+     <item>
+      <widget class="QFrame" name="frame_2">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="frameShape">
+        <enum>QFrame::Box</enum>
+       </property>
+       <property name="frameShadow">
+        <enum>QFrame::Raised</enum>
+       </property>
+       <layout class="QHBoxLayout" name="horizontalLayout">
+        <property name="spacing">
+         <number>0</number>
+        </property>
+        <item>
+         <spacer name="horizontalSpacer_5">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeType">
+           <enum>QSizePolicy::Fixed</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>13</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <widget class="MonBoutonValide" name="RBValide">
+          <property name="minimumSize">
+           <size>
+            <width>17</width>
+            <height>31</height>
+           </size>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>21</width>
+            <height>31</height>
+           </size>
+          </property>
+          <property name="focusPolicy">
+           <enum>Qt::ClickFocus</enum>
+          </property>
+          <property name="toolTip">
+           <string>Affiche le rapport de validité de la commande</string>
+          </property>
+          <property name="styleSheet">
+           <string notr="true">border : 0px</string>
+          </property>
+          <property name="text">
+           <string>...</string>
+          </property>
+          <property name="icon">
+           <iconset>
+            <normaloff>../Editeur/icons/ast-green-ball.png</normaloff>../Editeur/icons/ast-green-ball.png</iconset>
+          </property>
+          <property name="iconSize">
+           <size>
+            <width>21</width>
+            <height>31</height>
+           </size>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer name="horizontalSpacer_3">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeType">
+           <enum>QSizePolicy::Fixed</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>13</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <widget class="MonLabelClic" name="labelNomCommande">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>150</width>
+            <height>31</height>
+           </size>
+          </property>
+          <property name="frameShape">
+           <enum>QFrame::NoFrame</enum>
+          </property>
+          <property name="frameShadow">
+           <enum>QFrame::Raised</enum>
+          </property>
+          <property name="text">
+           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#0000ff;&quot;&gt;Formule&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer name="toto">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeType">
+           <enum>QSizePolicy::Maximum</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>2</width>
+            <height>40</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <widget class="QLineEdit" name="LENom">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="toolTip">
+           <string>Nom de l'objet. Seuls, les objets valides peuvent être nommés</string>
+          </property>
+          <property name="styleSheet">
+           <string notr="true"> QLineEdit {
+     border: 2px solid gray;
+     border-radius: 10px;
+     padding: 0 8px;
+     background: darkgray;
+   /*  selection-background-color: darkgray;*/
+ }
+QLineEdit:disabled
+{
+    background: lightgray;
+}
+/*read-only {
+     background: lightblue;*/</string>
+          </property>
+          <property name="readOnly">
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer name="horizontalSpacer_2">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeType">
+           <enum>QSizePolicy::Ignored</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>2</width>
+            <height>40</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <layout class="QHBoxLayout" name="horizontalLayout_2">
+          <property name="spacing">
+           <number>4</number>
+          </property>
+          <property name="sizeConstraint">
+           <enum>QLayout::SetFixedSize</enum>
+          </property>
+         </layout>
+        </item>
+        <item>
+         <spacer name="horizontalSpacer_4">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeType">
+           <enum>QSizePolicy::Fixed</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>13</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <widget class="QToolButton" name="RBPoubelle">
+          <property name="minimumSize">
+           <size>
+            <width>21</width>
+            <height>31</height>
+           </size>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>21</width>
+            <height>31</height>
+           </size>
+          </property>
+          <property name="focusPolicy">
+           <enum>Qt::ClickFocus</enum>
+          </property>
+          <property name="toolTip">
+           <string>Détruit la commande</string>
+          </property>
+          <property name="styleSheet">
+           <string notr="true">border : 0px</string>
+          </property>
+          <property name="text">
+           <string>...</string>
+          </property>
+          <property name="icon">
+           <iconset>
+            <normaloff>../Editeur/icons/deleteRond.png</normaloff>../Editeur/icons/deleteRond.png</iconset>
+          </property>
+          <property name="iconSize">
+           <size>
+            <width>21</width>
+            <height>31</height>
+           </size>
+          </property>
+         </widget>
+        </item>
+       </layout>
+       <zorder>RBValide</zorder>
+       <zorder>labelNomCommande</zorder>
+       <zorder>LENom</zorder>
+       <zorder>horizontalSpacer_3</zorder>
+       <zorder>horizontalSpacer_4</zorder>
+       <zorder>RBPoubelle</zorder>
+       <zorder>horizontalSpacer_5</zorder>
+      </widget>
+     </item>
+     <item>
+      <layout class="QVBoxLayout" name="verticalLayout_2">
+       <item>
+        <widget class="QPushButton" name="bCatalogue">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>160</width>
+           <height>31</height>
+          </size>
+         </property>
+         <property name="focusPolicy">
+          <enum>Qt::ClickFocus</enum>
+         </property>
+         <property name="toolTip">
+          <string>Affiche les commandes possibles</string>
+         </property>
+         <property name="styleSheet">
+          <string notr="true">background-color:rgb(104,110,149);
+color :white;
+border-radius : 12px
+</string>
+         </property>
+         <property name="text">
+          <string>&amp;Commandes</string>
+         </property>
+         <property name="shortcut">
+          <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>
+        </widget>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_3">
+         <item>
+          <widget class="QPushButton" name="bAvant">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>60</width>
+             <height>24</height>
+            </size>
+           </property>
+           <property name="maximumSize">
+            <size>
+             <width>60</width>
+             <height>24</height>
+            </size>
+           </property>
+           <property name="focusPolicy">
+            <enum>Qt::ClickFocus</enum>
+           </property>
+           <property name="toolTip">
+            <string>Affiche le formulaire de la commande précédente</string>
+           </property>
+           <property name="styleSheet">
+            <string notr="true">background-color:rgb(104,110,149);
+color :white;
+border-radius : 12px
+</string>
+           </property>
+           <property name="text">
+            <string>&lt;&lt;</string>
+           </property>
+           <property name="shortcut">
+            <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>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="bApres">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>60</width>
+             <height>24</height>
+            </size>
+           </property>
+           <property name="maximumSize">
+            <size>
+             <width>60</width>
+             <height>24</height>
+            </size>
+           </property>
+           <property name="focusPolicy">
+            <enum>Qt::ClickFocus</enum>
+           </property>
+           <property name="toolTip">
+            <string>Affiche le formulaire de la commande suivante</string>
+           </property>
+           <property name="styleSheet">
+            <string notr="true">background-color:rgb(104,110,149);
+color :white;
+border-radius : 12px
+</string>
+           </property>
+           <property name="text">
+            <string>&gt;&gt;</string>
+           </property>
+           <property name="shortcut">
+            <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>
+          </widget>
+         </item>
+        </layout>
+       </item>
+      </layout>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QScrollArea" name="scrollAreaCommandes">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>81</height>
+      </size>
+     </property>
+     <property name="styleSheet">
+      <string notr="true">background : rgb(247,247,247)
+
+
+</string>
+     </property>
+     <property name="frameShape">
+      <enum>QFrame::NoFrame</enum>
+     </property>
+     <property name="verticalScrollBarPolicy">
+      <enum>Qt::ScrollBarAsNeeded</enum>
+     </property>
+     <property name="horizontalScrollBarPolicy">
+      <enum>Qt::ScrollBarAsNeeded</enum>
+     </property>
+     <property name="widgetResizable">
+      <bool>true</bool>
+     </property>
+     <widget class="QWidget" name="scrollAreaWidgetContents">
+      <property name="geometry">
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>1138</width>
+        <height>598</height>
+       </rect>
+      </property>
+      <layout class="QVBoxLayout" name="verticalLayout_5">
+       <item>
+        <layout class="QGridLayout" name="gridLayout">
+         <item row="0" column="0">
+          <widget class="QLabel" name="textLabel1_4">
+           <property name="minimumSize">
+            <size>
+             <width>0</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>&lt;h3&gt;&lt;p align=&quot;center&quot;&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>
+           <property name="wordWrap">
+            <bool>false</bool>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="1" rowspan="2">
+          <layout class="QVBoxLayout" name="verticalLayout">
+           <item>
+            <widget class="QLabel" name="textLabel1_2">
+             <property name="text">
+              <string>&lt;h3&gt;&lt;p align=&quot;center&quot;&gt;&lt;u&gt;&lt;b&gt;Arguments&lt;/b&gt;&lt;/u&gt;&lt;/p&gt;&lt;/h3&gt;</string>
+             </property>
+             <property name="wordWrap">
+              <bool>false</bool>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLabel" name="textLabel2">
+             <property name="text">
+              <string>variables séparées par des &quot;,&quot;
+          par ex. : x,y,z</string>
+             </property>
+             <property name="wordWrap">
+              <bool>false</bool>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item row="0" column="4">
+          <widget class="QLabel" name="textLabel1_5">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>0</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>&lt;h3&gt;&lt;p align=&quot;center&quot;&gt;&lt;u&gt;&lt;b&gt;Expression&lt;/b&gt;&lt;/u&gt;&lt;/p&gt;&lt;/h3&gt;</string>
+           </property>
+           <property name="wordWrap">
+            <bool>false</bool>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="3">
+          <spacer name="horizontalSpacer_6">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeType">
+            <enum>QSizePolicy::Fixed</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>17</width>
+             <height>17</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item row="2" column="0">
+          <widget class="QLineEdit" name="LENomFormule">
+           <property name="minimumSize">
+            <size>
+             <width>0</width>
+             <height>40</height>
+            </size>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="1">
+          <layout class="QHBoxLayout" name="horizontalLayout_5">
+           <item>
+            <widget class="QLabel" name="textLabel1_6">
+             <property name="text">
+              <string>&lt;h1&gt;&lt;b&gt;(&lt;/b&gt;&lt;/h1&gt;</string>
+             </property>
+             <property name="wordWrap">
+              <bool>false</bool>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLineEdit" name="LENomsArgs">
+             <property name="minimumSize">
+              <size>
+               <width>230</width>
+               <height>40</height>
+              </size>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLabel" name="textLabel1_6_2">
+             <property name="text">
+              <string>&lt;h1&gt;&lt;b&gt;)&lt;/b&gt;&lt;/h1&gt;</string>
+             </property>
+             <property name="wordWrap">
+              <bool>false</bool>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item row="2" column="2">
+          <layout class="QVBoxLayout" name="verticalLayout_4">
+           <item>
+            <spacer name="verticalSpacer_2">
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>20</width>
+               <height>5</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+           <item>
+            <widget class="QLabel" name="textLabel2_2">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="minimumSize">
+              <size>
+               <width>0</width>
+               <height>35</height>
+              </size>
+             </property>
+             <property name="maximumSize">
+              <size>
+               <width>16777215</width>
+               <height>35</height>
+              </size>
+             </property>
+             <property name="text">
+              <string>&lt;font size=&quot;+4&quot; face=&quot;Helvetica&quot;&gt;&lt;b&gt;=&lt;/b&gt;&lt;/font&gt;</string>
+             </property>
+             <property name="wordWrap">
+              <bool>false</bool>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <spacer name="verticalSpacer_3">
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>20</width>
+               <height>10</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </item>
+         <item row="2" column="4">
+          <widget class="QLineEdit" name="LECorpsFormule">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>0</width>
+             <height>40</height>
+            </size>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>446</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11"/>
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <customwidgets>
+  <customwidget>
+   <class>MonBoutonValide</class>
+   <extends>QToolButton</extends>
+   <header>monBoutonValide.h</header>
+  </customwidget>
+  <customwidget>
+   <class>MonLabelClic</class>
+   <extends>QLabel</extends>
+   <header>monLabelClic.h</header>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>scrollAreaCommandes</tabstop>
+  <tabstop>LENomsArgs</tabstop>
+  <tabstop>LECorpsFormule</tabstop>
+  <tabstop>LENom</tabstop>
+  <tabstop>LENomFormule</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
index ca162eef1470a92fe6a73ab00a9505ab979c405c..079da5da9d18836bc5ca50918bfbb0214e4244d9 100644 (file)
@@ -30,6 +30,9 @@
 font : 'times' 9px</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
    <item>
     <widget class="QFrame" name="frame_2">
      <property name="sizePolicy">
@@ -98,7 +101,16 @@ font : 'times' 9px</string>
       <property name="spacing">
        <number>0</number>
       </property>
-      <property name="margin">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
        <number>0</number>
       </property>
       <item>
@@ -121,13 +133,13 @@ font : 'times' 9px</string>
         <property name="widgetResizable">
          <bool>true</bool>
         </property>
-        <widget class="QWidget" name="commandesOptionnellesWidget">
+        <widget class="QWidget" name="groupesOptionnelsW">
          <property name="geometry">
           <rect>
            <x>0</x>
            <y>0</y>
            <width>279</width>
-           <height>124</height>
+           <height>131</height>
           </rect>
          </property>
          <property name="sizePolicy">
@@ -136,7 +148,7 @@ font : 'times' 9px</string>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
-         <layout class="QVBoxLayout" name="commandesOptionnellesLayout">
+         <layout class="QVBoxLayout" name="groupesOptionnelsLayout">
           <item>
            <spacer name="verticalSpacer">
             <property name="orientation">
index 42e2fe3e676ff8cc3f8607cbdcdc94955abdda75..357c00978cd4a942d7ff09dee1b1bd3730c8d3e2 100644 (file)
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1058</width>
-    <height>440</height>
+    <width>786</width>
+    <height>515</height>
    </rect>
   </property>
   <property name="sizePolicy">
    <string notr="true">background-color : rgb(224,223,222);
 font : 'times' 9px</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_3">
+  <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_2">
-     <item>
-      <widget class="QFrame" name="frame_2">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="frameShape">
-        <enum>QFrame::Box</enum>
-       </property>
-       <property name="frameShadow">
-        <enum>QFrame::Raised</enum>
-       </property>
-       <layout class="QHBoxLayout" name="horizontalLayout">
-        <item>
-         <spacer name="horizontalSpacer_5">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Fixed</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>13</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class="MonBoutonValide" name="RBValide">
-          <property name="minimumSize">
-           <size>
-            <width>17</width>
-            <height>31</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>21</width>
-            <height>31</height>
-           </size>
-          </property>
-          <property name="toolTip">
-           <string/>
-          </property>
-          <property name="styleSheet">
-           <string notr="true">border : 0px</string>
-          </property>
-          <property name="text">
-           <string>...</string>
-          </property>
-          <property name="icon">
-           <iconset>
-            <normaloff>../Editeur/icons/ast-green-ball.png</normaloff>../Editeur/icons/ast-green-ball.png</iconset>
-          </property>
-          <property name="iconSize">
-           <size>
-            <width>21</width>
-            <height>31</height>
-           </size>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer name="horizontalSpacer_3">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Fixed</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>13</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class="QLabel" name="labelNomCommande">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>150</width>
-            <height>31</height>
-           </size>
-          </property>
-          <property name="frameShape">
-           <enum>QFrame::NoFrame</enum>
-          </property>
-          <property name="frameShadow">
-           <enum>QFrame::Raised</enum>
-          </property>
-          <property name="text">
-           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#000000;&quot;&gt;Paramètre&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-          </property>
-         </widget>
-        </item>
+    <widget class="QFrame" name="frameAffichage">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>130</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>130</height>
+      </size>
+     </property>
+     <property name="styleSheet">
+      <string notr="true">background-color:rgb(224,223,222)</string>
+     </property>
+     <property name="frameShape">
+      <enum>QFrame::NoFrame</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Raised</enum>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout_5">
+      <property name="spacing">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout_4">
         <item>
-         <spacer name="horizontalSpacer_2">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Maximum</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>78</width>
-            <height>40</height>
-           </size>
-          </property>
-         </spacer>
+         <layout class="QVBoxLayout" name="verticalLayout_3">
+          <item>
+           <widget class="QFrame" name="frame_3">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="frameShape">
+             <enum>QFrame::Box</enum>
+            </property>
+            <property name="frameShadow">
+             <enum>QFrame::Raised</enum>
+            </property>
+            <layout class="QHBoxLayout" name="horizontalLayout_6">
+             <property name="spacing">
+              <number>0</number>
+             </property>
+             <item>
+              <spacer name="horizontalSpacer_6">
+               <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+               </property>
+               <property name="sizeType">
+                <enum>QSizePolicy::Fixed</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>13</width>
+                 <height>20</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
+             <item>
+              <widget class="MonBoutonValide" name="RBValide">
+               <property name="minimumSize">
+                <size>
+                 <width>17</width>
+                 <height>31</height>
+                </size>
+               </property>
+               <property name="maximumSize">
+                <size>
+                 <width>21</width>
+                 <height>31</height>
+                </size>
+               </property>
+               <property name="focusPolicy">
+                <enum>Qt::ClickFocus</enum>
+               </property>
+               <property name="toolTip">
+                <string>Affiche le rapport de validité de la commande</string>
+               </property>
+               <property name="styleSheet">
+                <string notr="true">border : 0px</string>
+               </property>
+               <property name="text">
+                <string>...</string>
+               </property>
+               <property name="icon">
+                <iconset>
+                 <normaloff>../Editeur/icons/ast-green-ball.png</normaloff>../Editeur/icons/ast-green-ball.png</iconset>
+               </property>
+               <property name="iconSize">
+                <size>
+                 <width>21</width>
+                 <height>31</height>
+                </size>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <spacer name="horizontalSpacer_4">
+               <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+               </property>
+               <property name="sizeType">
+                <enum>QSizePolicy::Fixed</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>13</width>
+                 <height>20</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
+             <item>
+              <widget class="QLabel" name="labelParam">
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+               <property name="minimumSize">
+                <size>
+                 <width>150</width>
+                 <height>31</height>
+                </size>
+               </property>
+               <property name="frameShape">
+                <enum>QFrame::NoFrame</enum>
+               </property>
+               <property name="frameShadow">
+                <enum>QFrame::Raised</enum>
+               </property>
+               <property name="text">
+                <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#000000;&quot;&gt;Paramètre&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <spacer name="toto">
+               <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+               </property>
+               <property name="sizeType">
+                <enum>QSizePolicy::Maximum</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>2</width>
+                 <height>40</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
+             <item>
+              <spacer name="horizontalSpacer_8">
+               <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+               </property>
+               <property name="sizeType">
+                <enum>QSizePolicy::Ignored</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>2</width>
+                 <height>40</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
+             <item>
+              <spacer name="horizontalSpacer_9">
+               <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+               </property>
+               <property name="sizeType">
+                <enum>QSizePolicy::Fixed</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>13</width>
+                 <height>20</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
+             <item>
+              <widget class="QToolButton" name="RBPoubelle">
+               <property name="minimumSize">
+                <size>
+                 <width>21</width>
+                 <height>31</height>
+                </size>
+               </property>
+               <property name="maximumSize">
+                <size>
+                 <width>21</width>
+                 <height>31</height>
+                </size>
+               </property>
+               <property name="focusPolicy">
+                <enum>Qt::ClickFocus</enum>
+               </property>
+               <property name="toolTip">
+                <string>Détruit la commande</string>
+               </property>
+               <property name="styleSheet">
+                <string notr="true">border : 0px</string>
+               </property>
+               <property name="text">
+                <string>...</string>
+               </property>
+               <property name="icon">
+                <iconset>
+                 <normaloff>../Editeur/icons/deleteRond.png</normaloff>../Editeur/icons/deleteRond.png</iconset>
+               </property>
+               <property name="iconSize">
+                <size>
+                 <width>21</width>
+                 <height>31</height>
+                </size>
+               </property>
+              </widget>
+             </item>
+            </layout>
+            <zorder>RBValide</zorder>
+            <zorder>RBPoubelle</zorder>
+            <zorder>horizontalSpacer_4</zorder>
+            <zorder>labelParam</zorder>
+           </widget>
+          </item>
+          <item>
+           <spacer name="verticalSpacer_3">
+            <property name="orientation">
+             <enum>Qt::Vertical</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>20</width>
+              <height>40</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+         </layout>
         </item>
         <item>
-         <widget class="QToolButton" name="RBPoubelle">
-          <property name="minimumSize">
-           <size>
-            <width>21</width>
-            <height>31</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>21</width>
-            <height>31</height>
-           </size>
-          </property>
-          <property name="toolTip">
-           <string>Détruit le commentaire</string>
+         <layout class="QVBoxLayout" name="verticalLayout_4">
+          <property name="spacing">
+           <number>8</number>
           </property>
-          <property name="styleSheet">
-           <string notr="true">border : 0px</string>
+          <property name="topMargin">
+           <number>15</number>
           </property>
-          <property name="text">
-           <string>...</string>
-          </property>
-          <property name="icon">
-           <iconset>
-            <normaloff>../Editeur/icons/deleteRond.png</normaloff>../Editeur/icons/deleteRond.png</iconset>
-          </property>
-          <property name="iconSize">
-           <size>
-            <width>21</width>
-            <height>31</height>
-           </size>
-          </property>
-         </widget>
-        </item>
-       </layout>
-       <zorder>RBValide</zorder>
-       <zorder>labelNomCommande</zorder>
-       <zorder>horizontalSpacer_3</zorder>
-       <zorder>RBPoubelle</zorder>
-       <zorder>horizontalSpacer_5</zorder>
-      </widget>
-     </item>
-     <item>
-      <layout class="QVBoxLayout" name="verticalLayout_2">
-       <item>
-        <widget class="QPushButton" name="bCatalogue">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>160</width>
-           <height>31</height>
-          </size>
-         </property>
-         <property name="toolTip">
-          <string>Affiche les commandes possibles</string>
-         </property>
-         <property name="styleSheet">
-          <string notr="true">background-color:rgb(104,110,149);
+          <item>
+           <widget class="QPushButton" name="bCatalogue">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>160</width>
+              <height>31</height>
+             </size>
+            </property>
+            <property name="focusPolicy">
+             <enum>Qt::ClickFocus</enum>
+            </property>
+            <property name="toolTip">
+             <string>Affiche les commandes possibles</string>
+            </property>
+            <property name="styleSheet">
+             <string notr="true">background-color:rgb(104,110,149);
 color :white;
 border-radius : 12px
 </string>
-         </property>
-         <property name="text">
-          <string>&amp;Commandes</string>
-         </property>
-         <property name="shortcut">
-          <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>
-        </widget>
-       </item>
-       <item>
-        <layout class="QHBoxLayout" name="horizontalLayout_3">
-         <item>
-          <widget class="QPushButton" name="bAvant">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>60</width>
-             <height>24</height>
-            </size>
-           </property>
-           <property name="maximumSize">
-            <size>
-             <width>60</width>
-             <height>24</height>
-            </size>
-           </property>
-           <property name="focusPolicy">
-            <enum>Qt::ClickFocus</enum>
-           </property>
-           <property name="toolTip">
-            <string>Affiche le formulaire de la commande précédente</string>
-           </property>
-           <property name="styleSheet">
-            <string notr="true">background-color:rgb(104,110,149);
+            </property>
+            <property name="text">
+             <string>&amp;Commandes</string>
+            </property>
+            <property name="shortcut">
+             <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>
+           </widget>
+          </item>
+          <item>
+           <layout class="QHBoxLayout" name="horizontalLayout_8">
+            <item>
+             <widget class="QPushButton" name="bAvant">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="minimumSize">
+               <size>
+                <width>60</width>
+                <height>24</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>60</width>
+                <height>24</height>
+               </size>
+              </property>
+              <property name="focusPolicy">
+               <enum>Qt::ClickFocus</enum>
+              </property>
+              <property name="toolTip">
+               <string>Affiche le formulaire de la commande précédente</string>
+              </property>
+              <property name="styleSheet">
+               <string notr="true">background-color:rgb(104,110,149);
 color :white;
 border-radius : 12px
 </string>
-           </property>
-           <property name="text">
-            <string>&lt;&lt;</string>
-           </property>
-           <property name="shortcut">
-            <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>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="bApres">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>60</width>
-             <height>24</height>
-            </size>
-           </property>
-           <property name="maximumSize">
-            <size>
-             <width>60</width>
-             <height>24</height>
-            </size>
-           </property>
-           <property name="focusPolicy">
-            <enum>Qt::ClickFocus</enum>
-           </property>
-           <property name="toolTip">
-            <string>Affiche le formulaire de la commande suivante</string>
-           </property>
-           <property name="styleSheet">
-            <string notr="true">background-color:rgb(104,110,149);
+              </property>
+              <property name="text">
+               <string>&lt;&lt;</string>
+              </property>
+              <property name="shortcut">
+               <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>
+             </widget>
+            </item>
+            <item>
+             <widget class="QPushButton" name="bApres">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="minimumSize">
+               <size>
+                <width>60</width>
+                <height>24</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>60</width>
+                <height>24</height>
+               </size>
+              </property>
+              <property name="focusPolicy">
+               <enum>Qt::ClickFocus</enum>
+              </property>
+              <property name="toolTip">
+               <string>Affiche le formulaire de la commande suivante</string>
+              </property>
+              <property name="styleSheet">
+               <string notr="true">background-color:rgb(104,110,149);
 color :white;
 border-radius : 12px
 </string>
-           </property>
-           <property name="text">
-            <string>&gt;&gt;</string>
-           </property>
-           <property name="shortcut">
-            <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>
-          </widget>
-         </item>
-        </layout>
-       </item>
-      </layout>
-     </item>
-    </layout>
+              </property>
+              <property name="text">
+               <string>&gt;&gt;</string>
+              </property>
+              <property name="shortcut">
+               <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>
+             </widget>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
    </item>
    <item>
     <widget class="QScrollArea" name="scrollAreaCommandes">
@@ -369,8 +477,8 @@ border-radius : 12px
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>1040</width>
-        <height>349</height>
+        <width>768</width>
+        <height>361</height>
        </rect>
       </property>
       <layout class="QVBoxLayout" name="verticalLayout">
@@ -520,9 +628,6 @@ border-radius : 12px
   </customwidget>
  </customwidgets>
  <tabstops>
-  <tabstop>RBPoubelle</tabstop>
-  <tabstop>bCatalogue</tabstop>
-  <tabstop>RBValide</tabstop>
   <tabstop>scrollAreaCommandes</tabstop>
  </tabstops>
  <resources/>
index 569a8ecddec65302ff66105b5ccf675368e66274..0b3e5099c34b417dfae51ad441d2dab613a2b3e9 100644 (file)
        </property>
       </widget>
      </item>
+     <item>
+      <spacer name="verticalSpacer_6">
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>20</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout_5">
+       <item>
+        <widget class="QLineEdit" name="LEFiltre">
+         <property name="styleSheet">
+          <string notr="true">background:rgb(255,255,255)
+
+</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QToolButton" name="PBFind">
+         <property name="minimumSize">
+          <size>
+           <width>21</width>
+           <height>31</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>21</width>
+           <height>31</height>
+          </size>
+         </property>
+         <property name="toolTip">
+          <string>Détruit une ligne</string>
+         </property>
+         <property name="styleSheet">
+          <string notr="true">border : 0px</string>
+         </property>
+         <property name="text">
+          <string>...</string>
+         </property>
+         <property name="icon">
+          <iconset theme="find">
+           <normaloff>.</normaloff>.</iconset>
+         </property>
+         <property name="iconSize">
+          <size>
+           <width>32</width>
+           <height>32</height>
+          </size>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
      <item>
       <widget class="QScrollArea" name="scrollArea_2">
        <property name="sizePolicy">
           <x>0</x>
           <y>0</y>
           <width>300</width>
-          <height>166</height>
+          <height>122</height>
          </rect>
         </property>
         <layout class="QGridLayout" name="gridLayout_2">
-         <property name="horizontalSpacing">
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
           <number>0</number>
          </property>
-         <property name="margin">
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+         <property name="horizontalSpacing">
           <number>0</number>
          </property>
          <item row="0" column="0">
+          <layout class="QHBoxLayout" name="horizontalLayout_6">
+           <item>
+            <widget class="QPushButton" name="PBCata">
+             <property name="text">
+              <string>Catalogue</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QPushButton" name="PBAlpha">
+             <property name="text">
+              <string>Alpha</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <spacer name="horizontalSpacer_7">
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>40</width>
+               <height>20</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </item>
+         <item row="2" column="0">
           <widget class="QLabel" name="monCommentaireLabel">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
            </property>
           </widget>
          </item>
+         <item row="1" column="0">
+          <spacer name="verticalSpacer_3">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>40</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
         </layout>
        </widget>
       </widget>
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>543</width>
-        <height>232</height>
+        <width>419</width>
+        <height>230</height>
        </rect>
       </property>
       <property name="sizePolicy">
        <property name="spacing">
         <number>0</number>
        </property>
-       <property name="margin">
+       <property name="leftMargin">
+        <number>0</number>
+       </property>
+       <property name="topMargin">
+        <number>0</number>
+       </property>
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
         <number>0</number>
        </property>
       </layout>
   <zorder>horizontalSpacer</zorder>
   <zorder>scrollArea</zorder>
   <zorder></zorder>
-  <zorder>layoutWidget</zorder>
  </widget>
  <customwidgets>
   <customwidget>
index b6871e96c45f3a337c01b8201ee2cf100ce7816e..999b9620bffdc8f5f7e6b88b2cddcdbfe0b764ff 100644 (file)
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>1013</width>
-    <height>243</height>
+    <height>538</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -79,7 +79,7 @@
          </property>
          <property name="icon">
           <iconset>
-           <normaloff>../Editeur/icons/minusnode.png</normaloff>../Editeur/icons/minusnode.png</iconset>
+           <normaloff>../../../.designer/Editeur/icons/minusnode.png</normaloff>../../../.designer/Editeur/icons/minusnode.png</iconset>
          </property>
          <property name="iconSize">
           <size>
          </property>
          <property name="icon">
           <iconset>
-           <normaloff>../Editeur/icons/ast-green-ball.png</normaloff>../Editeur/icons/ast-green-ball.png</iconset>
+           <normaloff>../../../.designer/Editeur/icons/ast-green-ball.png</normaloff>../../../.designer/Editeur/icons/ast-green-ball.png</iconset>
          </property>
          <property name="iconSize">
           <size>
        </property>
       </widget>
      </item>
+     <item>
+      <spacer name="verticalSpacer_5">
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>20</width>
+         <height>40</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout_5">
+       <item>
+        <widget class="QLineEdit" name="LEFiltre">
+         <property name="styleSheet">
+          <string notr="true">background:rgb(255,255,255)
+
+</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QToolButton" name="PBFind">
+         <property name="minimumSize">
+          <size>
+           <width>21</width>
+           <height>31</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>21</width>
+           <height>31</height>
+          </size>
+         </property>
+         <property name="toolTip">
+          <string>Détruit une ligne</string>
+         </property>
+         <property name="styleSheet">
+          <string notr="true">border : 0px</string>
+         </property>
+         <property name="text">
+          <string>...</string>
+         </property>
+         <property name="icon">
+          <iconset theme="find">
+           <normaloff>../../../.designer/backup</normaloff>../../../.designer/backup</iconset>
+         </property>
+         <property name="iconSize">
+          <size>
+           <width>32</width>
+           <height>32</height>
+          </size>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout_6">
+       <item>
+        <widget class="QPushButton" name="PBCata">
+         <property name="text">
+          <string>Catalogue</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="PBAlpha">
+         <property name="text">
+          <string>Alpha</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer_7">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <spacer name="verticalSpacer_6">
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>20</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
      <item>
       <widget class="QScrollArea" name="scrollArea_2">
        <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
+        <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
          <rect>
           <x>0</x>
           <y>0</y>
-          <width>112</width>
-          <height>172</height>
+          <width>296</width>
+          <height>188</height>
          </rect>
         </property>
         <property name="sizePolicy">
         <layout class="QVBoxLayout" name="verticalLayout_6">
          <item>
           <widget class="QLabel" name="monCommentaireLabel">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
            <property name="text">
-            <string>TextLabel</string>
+            <string>fqsdfqdfqfqsfqsfqfqsfqsfqsfqsfqsdfqsfqsfqsf</string>
            </property>
           </widget>
          </item>
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>301</width>
-        <height>232</height>
+        <width>300</width>
+        <height>527</height>
        </rect>
       </property>
       <property name="sizePolicy">
        <property name="spacing">
         <number>0</number>
        </property>
-       <property name="margin">
+       <property name="leftMargin">
+        <number>0</number>
+       </property>
+       <property name="topMargin">
+        <number>0</number>
+       </property>
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
         <number>0</number>
        </property>
        <item>
             <x>0</x>
             <y>0</y>
             <width>297</width>
-            <height>187</height>
+            <height>482</height>
            </rect>
           </property>
           <property name="sizePolicy">
            <property name="spacing">
             <number>0</number>
            </property>
-           <property name="margin">
+           <property name="leftMargin">
+            <number>0</number>
+           </property>
+           <property name="topMargin">
+            <number>0</number>
+           </property>
+           <property name="rightMargin">
+            <number>0</number>
+           </property>
+           <property name="bottomMargin">
             <number>0</number>
            </property>
            <item>
         <property name="spacing">
          <number>0</number>
         </property>
-        <property name="margin">
+        <property name="leftMargin">
+         <number>0</number>
+        </property>
+        <property name="topMargin">
+         <number>0</number>
+        </property>
+        <property name="rightMargin">
+         <number>0</number>
+        </property>
+        <property name="bottomMargin">
          <number>0</number>
         </property>
         <item>
             </property>
             <property name="icon">
              <iconset theme="go-up">
-              <normaloff/>
-             </iconset>
+              <normaloff>../../../.designer/backup</normaloff>../../../.designer/backup</iconset>
             </property>
             <property name="iconSize">
              <size>
             </property>
             <property name="icon">
              <iconset theme="go-down">
-              <normaloff/>
-             </iconset>
+              <normaloff>../../../.designer/backup</normaloff>../../../.designer/backup</iconset>
             </property>
             <property name="iconSize">
              <size>
             </property>
             <property name="icon">
              <iconset>
-              <normaloff>../Editeur/icons/MoinsBleu2.png</normaloff>../Editeur/icons/MoinsBleu2.png</iconset>
+              <normaloff>../../../.designer/Editeur/icons/MoinsBleu.png</normaloff>../../../.designer/Editeur/icons/MoinsBleu.png</iconset>
             </property>
             <property name="iconSize">
              <size>
             </property>
             <property name="icon">
              <iconset>
-              <normaloff>../Editeur/icons/PlusBleu.png</normaloff>../Editeur/icons/PlusBleu.png</iconset>
+              <normaloff>../../../.designer/Editeur/icons/PlusBleu.png</normaloff>../../../.designer/Editeur/icons/PlusBleu.png</iconset>
             </property>
             <property name="iconSize">
              <size>
           </property>
           <property name="icon">
            <iconset>
-            <normaloff>../Editeur/icons/verre-loupe-icone-6087-64.png</normaloff>../Editeur/icons/verre-loupe-icone-6087-64.png</iconset>
+            <normaloff>../../../.designer/Editeur/icons/verre-loupe-icone-6087-64.png</normaloff>../../../.designer/Editeur/icons/verre-loupe-icone-6087-64.png</iconset>
           </property>
           <property name="iconSize">
            <size>
        </property>
        <property name="icon">
         <iconset>
-         <normaloff>../Editeur/icons/deleteRond.png</normaloff>../Editeur/icons/deleteRond.png</iconset>
+         <normaloff>../../../.designer/Editeur/icons/deleteRond.png</normaloff>../../../.designer/Editeur/icons/deleteRond.png</iconset>
        </property>
        <property name="iconSize">
         <size>
   <zorder>horizontalSpacer_2</zorder>
   <zorder>horizontalSpacer_3</zorder>
   <zorder>scrollArea</zorder>
+  <zorder></zorder>
  </widget>
  <customwidgets>
   <customwidget>
index a55818817b89b3b9c3232d530bfeae8b9b5c2f73..b39fa176d4f1241259d74a6ba1a4fcae8e0b800a 100644 (file)
@@ -25,7 +25,7 @@
   <property name="maximumSize">
    <size>
     <width>16777215</width>
-    <height>16777215</height>
+    <height>90</height>
    </size>
   </property>
   <property name="windowTitle">
        <property name="orientation">
         <enum>Qt::Vertical</enum>
        </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Minimum</enum>
+       </property>
        <property name="sizeHint" stdset="0">
         <size>
          <width>20</width>
    <item>
     <widget class="MonLabelClic" name="label">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+      <sizepolicy hsizetype="Fixed" vsizetype="Minimum">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
        <property name="orientation">
         <enum>Qt::Vertical</enum>
        </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Minimum</enum>
+       </property>
        <property name="sizeHint" stdset="0">
         <size>
          <width>20</width>
index 013c21830ef930c3e8b15bcf99e76a66580959f6..6a1577ae93e374d17fbdcaacb2c693fe5c449b6a 100644 (file)
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>1065</width>
-    <height>62</height>
+    <height>56</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -25,7 +25,7 @@
   <property name="maximumSize">
    <size>
     <width>1493</width>
-    <height>85</height>
+    <height>56</height>
    </size>
   </property>
   <property name="windowTitle">
        <property name="orientation">
         <enum>Qt::Vertical</enum>
        </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Minimum</enum>
+       </property>
        <property name="sizeHint" stdset="0">
         <size>
          <width>20</width>
index 2c0ed33f141f2f8863702c54c722da0433148d14..53b664492b2aad59eeba4011ab842c2044e8fc91 100644 (file)
@@ -8,8 +8,8 @@ PY_FILES = myMain.py desBaseWidget.py desChoixCata.py desChoixCode.py desChoixCo
        desSelectVal.py desViewTexte.py desViewRegles.py desVisu.py desWidgetCreeParam.py desWidgetCommande.py \
        desWidgetOptionnel.py desWidgetOptionnelMC.py Tuple2.py Tuple3.py  \
        desWidgetBloc.py desWidgetCB.py desWidgetCommentaire.py desWidgetDate.py \
-       desWidgetFact.py desWidgetFactPlie.py desWidgetHeure.py desWidgetInformation.py \
-        desWidgetInactif.py \
+       desWidgetFact.py desWidgetFactPlie.py desWidgetFormule.py desGroupeOptionnel.py \
+       desWidgetHeure.py  desWidgetInformation.py desWidgetInactif.py \
        desWidgetMatrice.py desWidgetParam.py desWidgetPlusieursBase.py desWidgetPlusieursInto.py \
        desWidgetPlusieursIntoOrdonne.py desWidgetPlusieursTuple.py desWidgetRadioButton.py \
        desWidget4a6RadioButton.py desWidgetSimpBase.py desWidgetSDCOInto.py desWidgetSimpBool.py \
@@ -19,7 +19,7 @@ PY_FILES = myMain.py desBaseWidget.py desChoixCata.py desChoixCode.py desChoixCo
 
 
 
-QM_FILES=eficas_en.qm 
+QM_FILES=eficas_en.qm eficas_fr.qm
 
 %.py:%.ui
        ${PYUIC} -x -o $@ $<
index 04f25f74d26e3061e783062221efd000675e3d68..c5d954344c9b02b172225118a8ebebc78daba0df 100644 (file)
@@ -58,14 +58,20 @@ QMenuBar {
    <property name="styleSheet">
     <string notr="true">QComboBox{combobox-popup:0;}</string>
    </property>
-   <layout class="QVBoxLayout" name="verticalLayout">
-    <property name="spacing">
+   <layout class="QGridLayout" name="gridLayout">
+    <property name="leftMargin">
      <number>0</number>
     </property>
-    <property name="margin">
+    <property name="topMargin">
      <number>0</number>
     </property>
-    <item>
+    <property name="rightMargin">
+     <number>0</number>
+    </property>
+    <property name="bottomMargin">
+     <number>0</number>
+    </property>
+    <item row="0" column="0">
      <widget class="QFrame" name="frameEntete">
       <property name="minimumSize">
        <size>
@@ -95,7 +101,7 @@ QMenuBar {
       </property>
      </widget>
     </item>
-    <item>
+    <item row="1" column="0">
      <widget class="QTabWidget" name="myQtab">
       <property name="styleSheet">
        <string notr="true">background-color:rgb(224,223,222)</string>
@@ -124,7 +130,7 @@ QMenuBar {
      <x>0</x>
      <y>0</y>
      <width>1676</width>
-     <height>30</height>
+     <height>25</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFichier">
@@ -212,8 +218,7 @@ QMenuBar {
   <action name="action_Nouveau">
    <property name="icon">
     <iconset theme="document-new">
-     <normaloff/>
-    </iconset>
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>&amp;Nouveau</string>
@@ -238,8 +243,7 @@ QMenuBar {
   <action name="actionOuvrir">
    <property name="icon">
     <iconset theme="document-open">
-     <normaloff/>
-    </iconset>
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>&amp;Ouvrir</string>
@@ -251,8 +255,7 @@ QMenuBar {
   <action name="actionEnregistrer">
    <property name="icon">
     <iconset theme="document-save">
-     <normaloff/>
-    </iconset>
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>Enregistrer</string>
@@ -269,8 +272,7 @@ QMenuBar {
   <action name="actionEnregistrer_sous">
    <property name="icon">
     <iconset theme="document-save-as">
-     <normaloff/>
-    </iconset>
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>Enregistrer sous</string>
@@ -295,8 +297,7 @@ QMenuBar {
   <action name="actionCouper">
    <property name="icon">
     <iconset theme="edit-cut">
-     <normaloff/>
-    </iconset>
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>Couper</string>
@@ -311,8 +312,7 @@ QMenuBar {
   <action name="actionCopier">
    <property name="icon">
     <iconset theme="edit-copy">
-     <normaloff/>
-    </iconset>
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>Copier</string>
@@ -327,8 +327,7 @@ QMenuBar {
   <action name="actionColler">
    <property name="icon">
     <iconset theme="edit-paste">
-     <normaloff/>
-    </iconset>
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>Coller</string>
@@ -387,8 +386,7 @@ QMenuBar {
   <action name="actionSupprimer">
    <property name="icon">
     <iconset theme="edit-delete">
-     <normaloff/>
-    </iconset>
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>Supprimer</string>
@@ -411,8 +409,7 @@ QMenuBar {
   <action name="actionRechercher">
    <property name="icon">
     <iconset theme="edit-find">
-     <normaloff/>
-    </iconset>
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>Rechercher</string>
index 0b3e5099c34b417dfae51ad441d2dab613a2b3e9..ebe2232955559091a4097f3785252c6f67e83ee8 100644 (file)
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>938</width>
-    <height>236</height>
+    <height>200</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -19,7 +19,7 @@
   <property name="minimumSize">
    <size>
     <width>0</width>
-    <height>60</height>
+    <height>200</height>
    </size>
   </property>
   <property name="windowTitle">
     <number>2</number>
    </property>
    <property name="rightMargin">
-    <number>2</number>
+    <number>0</number>
    </property>
    <property name="bottomMargin">
-    <number>0</number>
+    <number>2</number>
    </property>
    <item>
     <layout class="QVBoxLayout" name="verticalLayout_2">
      </item>
      <item>
       <layout class="QHBoxLayout" name="horizontalLayout_5">
+       <property name="spacing">
+        <number>0</number>
+       </property>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_3"/>
+       </item>
        <item>
         <widget class="QLineEdit" name="LEFiltre">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>250</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>250</width>
+           <height>16777215</height>
+          </size>
+         </property>
          <property name="styleSheet">
           <string notr="true">background:rgb(255,255,255)
 
           </size>
          </property>
          <property name="toolTip">
-          <string>Détruit une ligne</string>
+          <string>Cherche la valeur</string>
          </property>
          <property name="styleSheet">
           <string notr="true">border : 0px</string>
          </property>
          <property name="icon">
           <iconset theme="find">
-           <normaloff>.</normaloff>.</iconset>
+           <normaloff/>
+          </iconset>
          </property>
          <property name="iconSize">
           <size>
          </property>
         </widget>
        </item>
+       <item>
+        <spacer name="horizontalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
       </layout>
      </item>
      <item>
           <x>0</x>
           <y>0</y>
           <width>300</width>
-          <height>122</height>
+          <height>95</height>
          </rect>
         </property>
         <layout class="QGridLayout" name="gridLayout_2">
-         <property name="leftMargin">
-          <number>0</number>
-         </property>
-         <property name="topMargin">
-          <number>0</number>
-         </property>
-         <property name="rightMargin">
-          <number>0</number>
-         </property>
-         <property name="bottomMargin">
+         <property name="horizontalSpacing">
           <number>0</number>
          </property>
-         <property name="horizontalSpacing">
+         <property name="margin">
           <number>0</number>
          </property>
          <item row="0" column="0">
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>419</width>
-        <height>230</height>
+        <width>422</width>
+        <height>194</height>
        </rect>
       </property>
       <property name="sizePolicy">
        <property name="spacing">
         <number>0</number>
        </property>
-       <property name="leftMargin">
-        <number>0</number>
-       </property>
-       <property name="topMargin">
-        <number>0</number>
-       </property>
-       <property name="rightMargin">
-        <number>0</number>
-       </property>
-       <property name="bottomMargin">
+       <property name="margin">
         <number>0</number>
        </property>
+       <item>
+        <spacer name="verticalSpacer_4">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
       </layout>
      </widget>
     </widget>
   <zorder>horizontalSpacer</zorder>
   <zorder>scrollArea</zorder>
   <zorder></zorder>
+  <zorder></zorder>
  </widget>
  <customwidgets>
   <customwidget>