]> SALOME platform Git repositories - tools/eficas.git/commitdiff
Salome HOME
import, formule, param et etc
authorpascale.noyret <pascale.noyret@edf.fr>
Wed, 16 Mar 2016 09:05:03 +0000 (10:05 +0100)
committerpascale.noyret <pascale.noyret@edf.fr>
Wed, 16 Mar 2016 09:05:03 +0000 (10:05 +0100)
41 files changed:
Ihm/I_FORM_ETAPE.py
InterfaceQT4/browser.py
InterfaceQT4/compocomm.py
InterfaceQT4/compooper.py
InterfaceQT4/editor.py
InterfaceQT4/gereIcones.py
InterfaceQT4/gereListe.py
InterfaceQT4/monChoixCode.py
InterfaceQT4/monChoixCommande.py
InterfaceQT4/monViewTexte.py
InterfaceQT4/monWidgetCommande.py
InterfaceQT4/monWidgetCommentaire.py
InterfaceQT4/monWidgetCreeParam.py
InterfaceQT4/monWidgetFormule.py [new file with mode: 0644]
InterfaceQT4/monWidgetInactif.py
InterfaceQT4/monWidgetMatrice.py
InterfaceQT4/monWidgetOptionnel.py
InterfaceQT4/monWidgetParam.py
InterfaceQT4/monWidgetPlusieursBase.py
InterfaceQT4/monWidgetPlusieursTuple.py
InterfaceQT4/monWidgetSDCOInto.py
InterfaceQT4/monWidgetSimpBase.py
InterfaceQT4/monWidgetSimpBool.py
InterfaceQT4/monWidgetSimpComplexe.py
InterfaceQT4/monWidgetSimpFichier.py
InterfaceQT4/monWidgetSimpSalome.py
InterfaceQT4/monWidgetSimpTuple.py
InterfaceQT4/monWidgetSimpTuple2.py
InterfaceQT4/monWidgetSimpTuple3.py
InterfaceQT4/qtEficas.py
InterfaceQT4/readercata.py
InterfaceQT4/typeNode.py
InterfaceQT4/viewManager.py
UiQT5/CMakeLists.txt
UiQT5/desChoixCommandes.ui
UiQT5/desWidgetCommande.ui
UiQT5/desWidgetCommentaire.ui
UiQT5/desWidgetCreeParam.ui
UiQT5/desWidgetFormule.ui [new file with mode: 0644]
UiQT5/desWidgetParam.ui
UiQT5/makefile

index ba3f97c8301927523110468438242d4874908b01..37323c9a64bcb1c2181079573eede5af71337fbf 100644 (file)
@@ -19,7 +19,9 @@
 #
 """
 """
-import string,traceback
+import string,traceback,re
+identifier = re.compile(r"^[^\d\W]\w*\Z", re.UNICODE)
+
 
 from Extensions.i18n import tr
 from I_MACRO_ETAPE import MACRO_ETAPE
@@ -110,6 +112,8 @@ class FORM_ETAPE(MACRO_ETAPE):
         test = 1
         arguments = arguments[1:-1] # on enlève les parenthèses ouvrante et fermante
         l_arguments = string.split(arguments,',')
+        for a in l_arguments :
+            if not re.match(identifier,str(a)) : return 0, str(a)+" n est pas un identifiant"
         return test,erreur
 
     def verif_corps(self,corps=None,arguments=None):
index ca143810d90023049ebb5ed30b2ba0005e2d172e..acc78cedd15d661818f05fd5cf9e028867fe4328 100644 (file)
@@ -686,6 +686,8 @@ class JDCNode(QTreeWidgetItem,GereRegles):
 
     def update_node_texte(self):
         """ Met a jour les noms des SD et valeurs des mots-cles """
+        print "kkkkkkkkkkkk"
+        print self.item.GetText()
         value = self.item.GetText()
         self.setText(1, value)
         
index 424baf7c161b645242a47c08efadae3f38def4b3..118d13c664b903c86bf25ece014cc1328c4c4a04 100644 (file)
@@ -44,8 +44,8 @@ class Node(browser.JDCNode,typeNode.PopUpMenuNodePartiel):
     def createPopUpMenu(self):
         typeNode.PopUpMenuNodePartiel.createPopUpMenu(self)
         self.Decommente = QAction(tr("Decommenter"),self.tree)
-        if monEnvQT5 : self.tree.connect(self.Decommente,SIGNAL("triggered()"),self.Decommenter)
-        else : self.Decommente.triggered(self.Decommenter)
+        if monEnvQT5 : self.Decommente.triggered(self.Decommenter)
+        else         : self.tree.connect(self.Decommente,SIGNAL("triggered()"),self.Decommenter)
         self.Decommente.setStatusTip(tr("Decommente la commande "))
 
         if hasattr(self.item,'uncomment'):
index 9978be11696a9e5d8c6c7cd4112a0a33af264d92..9fd380423a96d4e5495c0f016690d8bef8e24abb 100644 (file)
@@ -40,10 +40,10 @@ class Node(browser.JDCNode, typeNode.PopUpMenuNode):
 
     def select(self):
         browser.JDCNode.select(self)
-        #self.treeParent.tree.openPersistentEditor(self,1)
-        #self.monWidgetNom=self.treeParent.tree.itemWidget(self,1)
-        #self.treeParent.tree.connect(self.monWidgetNom,SIGNAL("returnPressed()"), self.nomme)
-        #if self.item.GetIconName() == "ast-red-square" : self.monWidgetNom.setDisabled(True)
+        self.treeParent.tree.openPersistentEditor(self,1)
+        self.monWidgetNom=self.treeParent.tree.itemWidget(self,1)
+        self.monWidgetNom.returnPressed.connect(self.nomme)
+        if self.item.GetIconName() == "ast-red-square" : self.monWidgetNom.setDisabled(True)
         #else : self.monWidgetNom.setFocus()  ;self.monWidgetNom.setDisabled(False)
 
     def nomme(self):
@@ -58,7 +58,7 @@ class Node(browser.JDCNode, typeNode.PopUpMenuNode):
            self.editor.affiche_commentaire(tr("Nommage du concept effectue"))
            self.onValid()
            try :
-              self.editor.panel.LENomConcept.setText(nom)
+              self.fenetre.LENom.setText(nom)
            except :
                pass
 
index 076c60a25cfb5ed91c1a846138ea32d514e1fde4..12b2616a078da43943e009b539358393ae32598a 100755 (executable)
@@ -25,7 +25,7 @@ from determine import monEnvQT5
 if monEnvQT5:
     from PyQt5.QtWidgets import QWidget, QMessageBox, QFileDialog, QApplication
     from PyQt5.QtGui import QPalette
-    from PyQt5.QtCore import QProcess, QFileInfo, QTimer, Qt
+    from PyQt5.QtCore import QProcess, QFileInfo, QTimer, Qt, QDir, QSize
 else :
     from PyQt4.QtGui  import *
     from PyQt4.QtCore import *
@@ -953,15 +953,23 @@ class JDCEditor(Ui_baseWidget,QWidget):
              tr("sauvegarde"), path,
              extensions,None,
              QFileDialog.DontConfirmOverwrite)
-      if fn.isNull(): return (0, None)
       if fn == None : return (0, None)
       if monEnvQT5 :  fn=fn[0]
+      if fn=='': return (0, None)
 
       ext = QFileInfo(fn).suffix()
-      if ext.isEmpty(): fn.append(extension)
+      if ext == '': fn+=extension
 
       if QFileInfo(fn).exists():
-           abort = QMessageBox.warning(self,
+           if monEnvQT5 :
+             msgBox = QMessageBox(self)
+             msgBox.setWindowTitle(tr("Sauvegarde du Fichier"))
+             msgBox.setText(tr("Le fichier <b>%s</b> existe deja.", unicode(fn)))
+             msgBox.addButton(tr("&Ecraser"),0)
+             msgBox.addButton(tr("&Abandonner"),1)
+             abort=msgBox.exec_()
+           else :
+             abort = QMessageBox.warning(self,
                    tr("Sauvegarde du Fichier"),
                    tr("Le fichier <b>%s</b> existe deja.",str(fn)),
                    tr("&Ecraser"),
@@ -1131,11 +1139,11 @@ class JDCEditor(Ui_baseWidget,QWidget):
           bOK, fn=self.determineNomFichier(path,extension)
           if bOK == 0 : return (0, None)
           if fn == None : return (0, None)
-          if fn.isNull(): return (0, None)
+          if fn== '' : return (0, None)
 
           ulfile = os.path.abspath(unicode(fn))
           self.appliEficas.CONFIGURATION.savedir=os.path.split(ulfile)[0]
-          fn = unicode(QDir.convertSeparators(fn))
+          fn = unicode(QDir.toNativeSeparators(fn))
           newName = fn
 
 
@@ -1212,7 +1220,7 @@ class JDCEditor(Ui_baseWidget,QWidget):
                    self.appliEficas.CONFIGURATION.savedir)
 
         # ce retour est impose par le get_file d'I_JDC
-        if fn.isNull(): return None," "
+        if fn== '' : return None," "
         if not fn : return (0, " ")
         if monEnvQT5 :  fn=fn[0]
 
@@ -1388,9 +1396,7 @@ class JDCEditor(Ui_baseWidget,QWidget):
    #-----------------------------
     def saveSplitterSizes(self):
     #----------------------------
-      if self.splitter != None :
-        self.splitterSizes = self.splitter.sizes()
-
+      if self.splitter != None : self.splitterSizes = self.splitter.sizes()
 
     #-----------------------------
     def restoreSplitterSizes(self):
@@ -1404,6 +1410,21 @@ class JDCEditor(Ui_baseWidget,QWidget):
             newSizes[len(newSizes)-1] = self.splitterSizes[len(self.splitterSizes)-1]
             self.splitter.setSizes(newSizes)
 
+    #-----------------------------
+    def restoreTailleTree(self):
+    #----------------------------
+      if hasattr(self,'splitterSizes') and self.splitterSizes != [] :
+         nbFenetre=len(self.splitter.sizes())
+         if nbFenetre == len(self.splitterSizes) :
+            self.splitter.setSizes(self.splitterSizes)
+            return
+           
+      if self.widgetOptionnel==None:
+         print "kkkkkkkkkkkkkk"
+         #
+      #PN
+
+
     #-----------------------------
     def getTreeIndex(self,noeud):
     #----------------------------
index 0d1b912a0ba53fa1c6ce61af06f068b3dc2d9a10..36d63a85ce904d266bbb6099f20669961fb002c2 100644 (file)
@@ -24,7 +24,7 @@ from  determine import monEnvQT5
 if monEnvQT5 :
   from PyQt5.QtWidgets import QMessageBox, QFileDialog
   from PyQt5.QtGui import QIcon
-  from PyQt5.QtCore import  QFileInfo,  Qt
+  from PyQt5.QtCore import  QFileInfo,  Qt, QSize
 
 else:
   from PyQt4.QtGui  import *
@@ -246,8 +246,8 @@ class ContientIcones:
                               self.appliEficas.CONFIGURATION.savedir,
                               filters)
 
-      if not(fichier.isNull()):
-         if monEnvQT5 : fichier=fichier[0]
+      if monEnvQT5 : fichier=fichier[0]
+      if not(fichier):
          ulfile = os.path.abspath(unicode(fichier))
          self.appliEficas.CONFIGURATION.savedir=os.path.split(ulfile)[0]
          self.lineEditVal.setText(fichier)
index a0426de075a44ae94e68415066af50085024e072..7f22797bc105ec60f3951b32deda7a2d3925b024 100644 (file)
@@ -23,8 +23,9 @@ import traceback
 
 from determine import monEnvQT5
 if monEnvQT5:
-   from PyQt5.QtWidgets import QLineEdit, QLabel, QIcon
-   from PyQt5.QtCore import QEvent
+   from PyQt5.QtWidgets import QLineEdit, QLabel
+   from PyQt5.QtCore    import QEvent
+   from PyQt5.QtGui     import QIcon
 else :
    from PyQt4.QtGui import *
    from PyQt4.QtCore import *
index e362e581101915575b6537d9ed1c773e6a196c0a..34ef7c28446c3324d642384ba6f593b41274dd6e 100644 (file)
 
 import os,sys,re
 from desChoixCode import Ui_ChoixCode
-f monEnvQT5:
+from determine import monEnvQT5
+if monEnvQT5:
     from PyQt5.QtWidgets import QDialog, QRadioButton
     from PyQt5.QtGui import QPalette
-    from PyQt5.QtCore import QProcess, QFileInfo, Qt
+    from PyQt5.QtCore import QProcess, QFileInfo, Qt, QSize
 else :
     from PyQt4.QtGui  import *
     from PyQt4.QtCore import *
index a8cc984e7e8491b0eeda5d80f76425b651e4f44b..5f887ccee371272992f26e96fd1ba0ab9e659465 100644 (file)
@@ -70,6 +70,7 @@ class MonChoixCommande(Ui_ChoixCommandes,QWidget):
          self.RBClear.clicked.connect(self.clearFiltre)
          self.RBCasse.toggled.connect(self.ajouteRadioButtons)
          self.LEFiltre.returnPressed.connect(self.ajouteRadioButtons)
+         self.LEFiltre.textChanged.connect(self.ajouteRadioButtons)
       else :
          self.connect(self.RBalpha,SIGNAL("clicked()"),self.afficheAlpha)
          self.connect(self.RBGroupe,SIGNAL("clicked()"),self.afficheGroupe)
index 690d8403032dd8d9a0dca80449b99e0bbdb6f79f..02af852de729040ba4aa9b4501ed46cf67ee79b6 100644 (file)
@@ -26,6 +26,7 @@ from Extensions.i18n import tr
 from determine import monEnvQT5
 if monEnvQT5 :
    from PyQt5.QtWidgets import QDialog, QMessageBox
+   from PyQt5.QtCore import QSize
 else :
    from PyQt4.QtGui import *
    from PyQt4.QtCore import *
@@ -65,9 +66,9 @@ class ViewText(Ui_dView,QDialog):
         fn = QFileDialog.getSaveFileName(None,
                 tr("Sauvegarder le fichier"),
                 dir)
-        if fn.isNull() : return
-        if fn == None : return (0, None)
         if monEnvQT5 :  fn=fn[0]
+        if fn == ""  : return
+        if fn == None : return (0, None)
 
         ulfile = os.path.abspath(unicode(fn))
         if self.editor != None :
index 83b94672a802857dbbdf44335eed8e39bdb5b923..4bf5aa534a9f1791916a9add109d4d59189fc67a 100644 (file)
@@ -51,7 +51,7 @@ class MonWidgetCommande(Ui_WidgetCommande,Groupe):
       self.ensure=0
       Groupe.__init__(self,node,editor,None,etape.definition,etape,1,self)
 
-      if node.item.get_fr() != "" : self.labelDoc.setText(QString(node.item.get_fr()))
+      if node.item.get_fr() != "" : self.labelDoc.setText(node.item.get_fr())
       else : self.labelDoc.close()
       
       if (etape.get_type_produit()==None): self.LENom.close()
@@ -88,7 +88,7 @@ class MonWidgetCommande(Ui_WidgetCommande,Groupe):
                self.connect(self.bApres,SIGNAL("clicked()"), self.afficheApres)
          self.connect(self.LENom,SIGNAL("returnPressed()"),self.nomChange)
    
-         self.racine=self.node.tree.racine
+      self.racine=self.node.tree.racine
       if self.node.item.GetIconName() == "ast-red-square" : self.LENom.setDisabled(True)
 
       self.setAcceptDrops(True)
@@ -101,6 +101,7 @@ class MonWidgetCommande(Ui_WidgetCommande,Groupe):
       #if hasattr(self.editor,'widgetOptionnel') : 
       if self.editor.widgetOptionnel!= None : 
         self.monOptionnel=self.editor.widgetOptionnel
+        self.editor.restoreSplitterSizes()
       else :
         self.monOptionnel=MonWidgetOptionnel(self)
         self.editor.widgetOptionnel=self.monOptionnel
index 1d422a77448cbf1e8d8032d35ee6836b4f58d588..5b222fb2ba083eada8117147d606abf9bccb8b7c 100644 (file)
 
 from determine import monEnvQT5
 if monEnvQT5:
-    from PyQt5.QtWidgets  import QWidget
+    from PyQt5.QtWidgets import QWidget
+    from PyQt5.QtCore    import Qt
 else :
     from PyQt4.QtGui  import *
-    from PyQt4.QtCore import
+    from PyQt4.QtCore import *
 
 from desWidgetCommentaire import Ui_WidgetCommentaire
 from gereIcones import FacultatifOuOptionnel
@@ -49,33 +50,58 @@ class MonWidgetCommentaire(QWidget,Ui_WidgetCommentaire,FacultatifOuOptionnel):
       self.repIcon=self.appliEficas.repIcon
       self.setIconePoubelle()
       self.remplitTexte()
-      if self.editor.code in ['MAP','CARMELCND'] : self.bCatalogue.close()
-      elif monEnvQT5 : self.bCatalogue.clicked.connect(self.afficheCatalogue)
-      else : self.connect(self.bCatalogue,SIGNAL("clicked()"), self.afficheCatalogue)
-      if monEnvQT5 : self.commentaireLE.returnPressed(TexteCommentaireEntre)
-      else : self.connect(self.commentaireLE,SIGNAL("returnPressed()"),self.TexteCommentaireEntre)
+      self.monOptionnel=None
+
+      if monEnvQT5 :
+         self.commentaireTE.textChanged.connect(self.TexteCommentaireEntre)
+         if self.editor.code in ['MAP','CARMELCND'] : self.bCatalogue.close()
+         else : self.bCatalogue.clicked.connect(self.afficheCatalogue)
+         if self.editor.code in ['Adao','MAP'] :
+               self.bAvant.close()
+               self.bApres.close()
+         else :
+               self.bAvant.clicked.connect(self.afficheAvant)
+               self.bApres.clicked.connect(self.afficheApres)
+      else :
+         if self.editor.code in ['MAP','CARMELCND'] : self.bCatalogue.close()
+         else : self.connect(self.bCatalogue,SIGNAL("clicked()"), self.afficheCatalogue)
+         if self.editor.code in ['Adao','MAP'] :
+               self.bAvant.close()
+               self.bApres.close()
+         else :
+               self.connect(self.bAvant,SIGNAL("clicked()"), self.afficheAvant)
+               self.connect(self.bApres,SIGNAL("clicked()"), self.afficheApres)
+
+  def afficheApres(self):
+       self.node.selectApres()
+
+  def afficheAvant(self):
+       self.node.selectAvant()
+
        
   def afficheCatalogue(self):
-      if self.editor.code != "CARMELCND" : self.monOptionnel.hide()
       self.node.tree.racine.affichePanneau()
       if self.node : self.node.select()
       else : self.node.tree.racine.select()
 
   def remplitTexte(self):
       texte=self.node.item.get_valeur()
-      self.commentaireLE.setText(texte)
+      self.commentaireTE.setText(texte)
       if self.editor.code == "CARMELCND" and texte[0:16]=="Cree - fichier :" :
-         self.commentaireLE.setDisabled(True)
-         self.commentaireLE.setStyleSheet("background:rgb(244,244,244);\n" "border:0px;\n")
-         self.commentaireLE.setToolTip(tr("Valeur non modifiable"))
+         self.commentaireTE.setReadOnly(True)
+         self.commentaireTE.setStyleSheet("background:rgb(244,244,244);\n" "border:0px;\n")
+         self.commentaireTE.setToolTip(tr("Valeur non modifiable"))
+      else :
+         self.commentaireTE.setReadOnly(False)
 
   def donnePremier(self):
-      self.commentaireLE.setFocus(7)
+      self.commentaireTE.setFocus(7)
 
 
   def TexteCommentaireEntre(self):
-      texte=str(self.commentaireLE.text())
+      texte=str(self.commentaireTE.toPlainText())
+      print texte
       self.editor.init_modif()
       self.node.item.set_valeur(texte)
-      self.node.update_node()
+      self.node.update_node_texte()
 
index 34feff33ec02d9082882c36857f557ebfefdb46e..cbd9c6a78e062a88b708b39ef1c2b69ee39c0e32 100644 (file)
@@ -26,6 +26,7 @@ pattern_name       = re.compile(r'^[^\d\W]\w*\Z')
 from determine import monEnvQT5
 if monEnvQT5 :
    from PyQt5.QtWidgets import QDialog
+   from PyQt5.QtCore import Qt
 else :
    from PyQt4.QtGui import *
    from PyQt4.QtCore import *
@@ -53,8 +54,8 @@ class MonWidgetCreeParam(Ui_desWidgetCreeParam,QDialog):
         self.connect(self.lineEditNom,SIGNAL("returnPressed()"),self.lineEditNomReturnPressed)
 
   def connecterSignaux(self) :
-        self.lineEditVal.returnPressed(self.lineEditValReturnPressed)
-        self.lineEditNom.returnPressed(self.lineEditNomReturnPressed)
+        self.lineEditVal.returnPressed.connect(self.lineEditValReturnPressed)
+        self.lineEditNom.returnPressed.connect(self.lineEditNomReturnPressed)
 
   def CreeParametre(self):
         nom=str(self.lineEditNom.text())
@@ -68,10 +69,15 @@ class MonWidgetCreeParam(Ui_desWidgetCreeParam,QDialog):
         param=itemAvant.addParameters(True)
         param.item.set_nom(nom)
         #PN self.val permet d entrer du texte
-        param.item.set_valeur(val)
+        param.item.set_valeur(self.val)
         param.update_node_texte()
         param.update_node_valid()
-        self.LBParam.addItem(QString(repr(param.item)))
+        self.LBParam.addItem((repr(param.item)))
+        param.select()
+        self.lineEditVal.setText("")
+        self.lineEditNom.setText("")
+        self.lineEditNom.setFocus(True)
+
 
 
   def lineEditValReturnPressed(self):
@@ -124,8 +130,8 @@ class MonWidgetCreeParam(Ui_desWidgetCreeParam,QDialog):
   def initToutesVal(self):
         self.LBParam.clear()
         for param in self.listeTousParam :
-            self.LBParam.addItem(QString(repr(param)))
-            self.dictListe[QString(repr(param))] = param
+            self.LBParam.addItem((repr(param)))
+            self.dictListe[repr(param)] = param
 
   def valideParam(self):
         if self.LBParam.selectedItems()== None : return
diff --git a/InterfaceQT4/monWidgetFormule.py b/InterfaceQT4/monWidgetFormule.py
new file mode 100644 (file)
index 0000000..f9cac5b
--- /dev/null
@@ -0,0 +1,211 @@
+# Copyright (C) 2007-2013   EDF R&D
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+# Modules Python
+# Modules Eficas
+
+from desWidgetFormule import Ui_WidgetFormule
+from gereIcones import FacultatifOuOptionnel
+from determine import monEnvQT5
+
+if monEnvQT5:
+   from PyQt5.QtWidgets  import QWidget
+   from PyQt5.QtGui import QIcon
+   from PyQt5.QtCore import Qt
+else :
+   from PyQt4.QtGui import *
+   from PyQt4.QtCore import *
+
+
+from Extensions.i18n import tr
+import Accas 
+import os
+import string
+
+    
+# Import des panels
+
+class MonWidgetFormule(QWidget,Ui_WidgetFormule,FacultatifOuOptionnel):
+  """
+  """
+  def __init__(self,node,editor,etape):
+      #print "MonWidgetFormule ", self
+      QWidget.__init__(self,None)
+      self.node=node
+      self.node.fenetre=self
+      self.editor=editor
+      self.appliEficas=self.editor.appliEficas
+      self.repIcon=self.appliEficas.repIcon
+      self.setupUi(self)
+      
+      self.setIconePoubelle()
+      self.setIconesGenerales()
+      self.setValide()
+
+     
+      if monEnvQT5 :
+         if self.editor.code in ['MAP','CARMELCND'] : self.bCatalogue.close()
+         else : self.bCatalogue.clicked.connect(self.afficheCatalogue)
+         if self.editor.code in ['Adao','MAP'] : 
+               self.bAvant.close()
+               self.bApres.close()
+         else : 
+               self.bAvant.clicked.connect(self.afficheAvant)
+               self.bApres.clicked.connect(self.afficheApres)
+         self.LENom.returnPressed.connect(self.nomChange)
+         self.LENomFormule.returnPressed.connect(self.NomFormuleSaisi)
+         self.LENomsArgs.returnPressed.connect(self.argsSaisis)
+         self.LECorpsFormule.returnPressed.connect(self.FormuleSaisie)
+      else : 
+         if self.editor.code in ['MAP','CARMELCND'] : self.bCatalogue.close()
+         else : self.connect(self.bCatalogue,SIGNAL("clicked()"), self.afficheCatalogue)
+         if self.editor.code in ['Adao','MAP'] : 
+               self.bAvant.close()
+               self.bApres.close()
+         else : 
+               self.connect(self.bAvant,SIGNAL("clicked()"), self.afficheAvant)
+               self.connect(self.bApres,SIGNAL("clicked()"), self.afficheApres)
+         self.connect(self.LENom,SIGNAL("returnPressed()"),self.nomChange)
+         self.connect(self.LENomFormule,SIGNAL("returnPressed()"),self.NomFormuleSaisi)
+         self.connect(self.LENomsArgs,SIGNAL("returnPressed()"),self.argsSaisis)
+         self.connect(self.LECorpsFormule,SIGNAL("returnPressed()"),self.FormuleSaisie)
+
+
+   
+      self.racine=self.node.tree.racine
+      self.monOptionnel=None
+      #self.editor.restoreSplitterSizes()
+      #print "fin init de widget Commande"
+      
+
+  def donnePremier(self):
+      self.listeAffichageWidget[0].setFocus(7)
+
+
+
+  def nomChange(self):
+      nom = str(self.LENom.text())
+      self.LENomFormule.setText(nom)
+      self.NomFormuleSaisi()
+
+
+  def afficheCatalogue(self):
+      if self.editor.widgetOptionnel != None : self.monOptionnel.hide()
+      self.racine.affichePanneau()
+      if self.node : self.node.select()
+      else : self.racine.select()
+
+  def afficheApres(self):
+       self.node.selectApres()
+
+  def afficheAvant(self):
+       self.node.selectAvant()
+
+  def setValide(self):
+      if not(hasattr (self,'RBValide')) : return
+      icon = QIcon()
+      if self.node.item.object.isvalid() :
+         icon=QIcon(self.repIcon+"/ast-green-ball.png")
+      else :
+         icon=QIcon(self.repIcon+"/ast-red-ball.png")
+      if self.node.item.GetIconName() == "ast-yellow-square" :
+         icon=QIcon(self.repIcon+"/ast-yel-ball.png")
+      self.RBValide.setIcon(icon)
+
+
+  def NomFormuleSaisi(self):
+      nomFormule = str(self.LENomFormule.text())
+      if nomFormule == '' : return
+      self.LENom.setText(nomFormule)
+      test,erreur = self.node.item.verif_nom(nomFormule)
+      if test :
+         commentaire=nomFormule+tr(" est un nom valide pour une FORMULE")
+         self.editor.affiche_infos(commentaire)
+      else :
+         commentaire=nomFormule+tr(" n'est pas un nom valide pour une FORMULE")
+         self.editor.affiche_infos(commentaire,Qt.red)
+         return
+      if str(self.LENomsArgs.text()) != "" and  str(self.LECorpsFormule.text())!= "" : self.BOkPressedFormule()
+      self.LENomsArgs.setFocus(7)
+
+  def argsSaisis(self):
+      arguments = str(self.LENomsArgs.text())
+      if arguments == '' : return
+      test,erreur = self.node.item.verif_arguments(arguments)
+      if test:
+         commentaire=tr("Argument(s) valide(s) pour une FORMULE")
+         self.editor.affiche_infos(commentaire)
+      else:
+         commentaire=tr("Argument(s) invalide(s) pour une FORMULE")
+         self.editor.affiche_infos(commentaire,Qt.red)
+      if str(self.LECorpsFormule.text()) != "" and  str(self.LENomFormule.text())!= "" : self.BOkPressedFormule()
+      self.LECorpsFormule.setFocus(7)
+
+  def FormuleSaisie(self):
+      nomFormule = str(self.LENomFormule.text())
+      arguments  = str(self.LENomsArgs.text())
+      expression = str(self.LECorpsFormule.text())
+      if expression == '' : return
+      test,erreur = self.node.item.verif_formule_python((nomFormule,"REEL",arguments,expression))
+
+      if test:
+         commentaire=tr("Corps de FORMULE valide")
+         self.editor.affiche_infos(commentaire)
+      else:
+         commentaire=tr("Corps de FORMULE invalide")
+         self.editor.affiche_infos(commentaire,Qt.red)
+      if str(self.LENomsArgs.text()) != "" and  str(self.LENomFormule.text())!= "" : self.BOkPressedFormule()
+
+  def BOkPressedFormule(self):
+      #print dir(self)
+      #if self.parent.modified == 'n' : self.parent.init_modif()
+
+      nomFormule = str(self.LENomFormule.text())
+      test,erreur = self.node.item.verif_nom(nomFormule)
+      if not test :
+         self.editor.affiche_infos(erreur,Qt.red)
+         return
+
+      arguments  = str(self.LENomsArgs.text())
+      test,erreur = self.node.item.verif_arguments(arguments)
+      if not test :
+         self.editor.affiche_infos(erreur,Qt.red)
+         return
+
+      expression = str(self.LECorpsFormule.text())
+      test,erreur = self.node.item.verif_formule_python((nomFormule,"REEL",arguments,expression))
+      if not test :
+         self.editor.affiche_infos(erreur,Qt.red)
+         return
+
+      test=self.node.item.object.update_formule_python(formule=(nomFormule,"REEL",arguments,expression))
+      test,erreur = self.node.item.save_formule(nomFormule,"REEL",arguments,expression)
+      if test :
+         #self.node.update_texte()
+         #self.node.update_label()
+         #self.node.update_node()
+         self.node.onValid()
+         self.node.update_valid()
+         commentaire = "Formule saisie"
+         self.editor.affiche_infos(commentaire)
+      else:
+         commentaire ="Formule incorrecte : " + erreur
+         self.editor.affiche_infos(commentaire,Qt.red)
+      self.editor.init_modif()
+
index c3929af5d86c7826682fac68c1485d7a3af5803b..6ab006aeaca687387d0190953d177c8d03331439 100644 (file)
@@ -66,6 +66,8 @@ class MonWidgetInactif(QWidget,Ui_WidgetInactif):
   def traiteClicSurLabel(self):
       pass
   
+  def donnePremier(self):
+      pass
 
   def setValide(self):
       pass 
index 7e3cca492bd88b887e9eeba03320c5ecf6317ee7..9a7ba46e7a01f3bfc42ce75eb58080036e0e48dc 100644 (file)
@@ -28,6 +28,12 @@ from feuille         import Feuille
 from desWidgetMatrice  import Ui_desWidgetMatrice 
 
 from determine import monEnvQT5
+if monEnvQT5 :
+   from PyQt5.QtCore import QSize
+else :
+   from PyQt4.QtGui import *
+   from PyQt4.QtCore import *
+
 
 class MonWidgetMatrice (Ui_desWidgetMatrice,Feuille):
 # c est juste la taille des differents widgets de base qui change
index b63c469eebcfb7606468b6a450c22ac0d3eec2f6..dd0b60e46fee7dac53ef848ab5c2aead39b20086 100644 (file)
@@ -22,6 +22,7 @@
 from determine import monEnvQT5
 if monEnvQT5:
     from PyQt5.QtWidgets import QCheckBox, QWidget
+    from PyQt5.QtCore import Qt
 else :
     from PyQt4.QtGui  import *
     from PyQt4.QtCore import *
index b9c024839e84b0b472fa1b42f449855d930557f0..e2b832b371e873717a7d47be1d89beed80756f18 100644 (file)
@@ -55,15 +55,15 @@ class MonWidgetParam(QWidget,Ui_WidgetParam,FacultatifOuOptionnel):
       self.setIconePoubelle()
       self.remplit()
       if self.editor.code in ['MAP','CARMELCND'] : self.bCatalogue.close()
-      elif monEnvQt5 : self.bCatalogue.clicked.connect(self.afficheCatalogue)
+      elif monEnvQT5 : self.bCatalogue.clicked.connect(self.afficheCatalogue)
       else : self.connect(self.bCatalogue,SIGNAL("clicked()"), self.afficheCatalogue)
 
-      if monEnvQt5 :
-        self.lineEditVal.returnPressed.connect.(self.LEValeurPressed)
-        self.lineEditNom.returnPressed.connect.(self.LENomPressed)
-        self.bAvant.clicked.connect.(self.afficheAvant)
-        self.bApres.clicked.connect.(self.afficheApres)
-        self.bVerifie.clicked.connect.(self.verifiePressed)
+      if monEnvQT5 :
+        self.lineEditVal.returnPressed.connect(self.LEValeurPressed)
+        self.lineEditNom.returnPressed.connect(self.LENomPressed)
+        self.bAvant.clicked.connect(self.afficheAvant)
+        self.bApres.clicked.connect(self.afficheApres)
+        self.bVerifie.clicked.connect(self.verifiePressed)
       else :
         self.connect(self.lineEditVal,SIGNAL("returnPressed()"),self.LEValeurPressed)
         self.connect(self.lineEditNom,SIGNAL("returnPressed()"),self.LENomPressed)
index cb1b427ac1148d10081effaee9617e0ab15e0bff..1a1d53a1102b97dd899728383ebe88b01622a517 100644 (file)
@@ -22,8 +22,9 @@ import string,types,os,sys
 
 from determine import monEnvQT5
 if monEnvQT5:
-    from PyQt5.QtGui  import Qicon, QApplication
-    from PyQt5.QtCore import QTimer, QSize, QT
+    from PyQt5.QtGui     import Qicon, 
+    from PyQt5.QtWidgets import QApplication
+    from PyQt5.QtCore    import QTimer, QSize, Qt
 else :
     from PyQt4.QtGui  import *
     from PyQt4.QtCore import *
index 93a2008863e005aade29fd7c1c9c8da72f3ec8fd..302f0cc258ab23257c97b76745dd2abf2057ea07 100644 (file)
@@ -23,10 +23,12 @@ import string,types,os,sys
 # Modules Eficas
 from determine import monEnvQT5
 if monEnvQT5:
-    from PyQt5.QtWidgets  import QIcon, QSize, QFrame,QApplication
+    from PyQt5.QtWidgets  import QFrame,QApplication
+    from PyQt5.QtGui  import QIcon, QFrame
+    from PyQt5.QtCore  import QSize
 else :
     from PyQt4.QtGui  import *
-    from PyQt4.QtCore import
+    from PyQt4.QtCore import *
 
 from Extensions.i18n import tr
 
@@ -57,7 +59,7 @@ class TupleCustom :
          courant=getattr(self,nomLE)
          courant.num=index
          courant.dansUnTuple=True
-         if monEnvQt5 : courant.returnPressed.connect(self.valueChange)
+         if monEnvQT5 : courant.returnPressed.connect(self.valueChange)
          else : self.connect(courant,SIGNAL("returnPressed()"),self.valueChange)
 
 
@@ -167,7 +169,7 @@ class MonWidgetPlusieursTuple(Feuille,GereListe):
           icon3 = QIcon(fichier3)
           self.BSelectFichier.setIcon(icon3)
           self.BSelectFichier.setIconSize(QSize(32, 32))
-        if monEnvQt5 :
+        if monEnvQT5 :
           self.BSelectFichier.clicked.connect(self.selectInFile)
         else :
           self.connect(self.BSelectFichier,SIGNAL("clicked()"), self.selectInFile)
index 7f376a5cbc01bc29aefef531bce6339bbbf04ce7..3de917108bbb69f7867be29c4fea5ea32c5847cd 100644 (file)
 import string,types,os
 
 # Modules Eficas
-from PyQt4.QtGui import *
-from PyQt4.QtCore import *
+from determine import monEnvQT5
+if monEnvQT5:
+    from PyQt5.QtWidgets import QLineEdit
+    from PyQt5.QtCore import Qt
+else :
+    from PyQt4.QtGui  import *
+    from PyQt4.QtCore import *
 from Extensions.i18n import tr
 
 from feuille               import Feuille
@@ -42,8 +47,13 @@ class MonWidgetSDCOInto (Ui_WidgetSDCOInto,Feuille,SaisieSDCO):
         self.maCommande.listeAffichageWidget.append(self.LESDCO)
         self.AAficher=self.LESDCO
         self.initLBSDCO()
-        self.connect(self.LESDCO, SIGNAL("returnPressed()"),self.LESDCOReturnPressed)
-        self.connect(self.LBSDCO, SIGNAL("itemDoubleClicked(QListWidgetItem*)" ), self.LBSDCODoubleClicked )
+       
+        if monEnvQT5 :
+          self.LESDCO.returnPressed.connect(self.LESDCOReturnPressed)
+          self.LBSDCO.itemDoubleClicked.connect(self.LBSDCODoubleClicked )
+        else :
+          self.connect(self.LESDCO, SIGNAL("returnPressed()"),self.LESDCOReturnPressed)
+          self.connect(self.LBSDCO, SIGNAL("itemDoubleClicked(QListWidgetItem*)" ), self.LBSDCODoubleClicked )
 
   def LESDCOReturnPressed(self) :
         self.LBSDCO.clearSelection()
@@ -56,7 +66,7 @@ class MonWidgetSDCOInto (Ui_WidgetSDCOInto,Feuille,SaisieSDCO):
             self.LBSDCO.insertItem( 1,aSDCO)
         valeur = self.node.item.get_valeur()
         if valeur  != "" and valeur != None :
-           self.LESDCO.setText(QString(valeur.nom))
+           self.LESDCO.setText(str(valeur.nom))
 
 
   def LBSDCODoubleClicked(self):
@@ -82,7 +92,7 @@ class MonWidgetSDCOInto (Ui_WidgetSDCOInto,Feuille,SaisieSDCO):
              self.node.item.delete_valeur_co(valeur=anc_val)
              self.node.item.object.etape.get_type_produit(force=1)
              self.node.item.object.etape.parent.reset_context()
-             self.LESDCO.setText(QString(nomConcept))
+             self.LESDCO.setText(nomConcept)
         else :
           commentaire = self.node.item.get_cr()
           self.reset_old_valeur(anc_val,mess=mess)
index e2d75ae6db1223737e122ae46e5db84038f4a145..9022095f21cfaac6a383edf56111ca5078d153a8 100644 (file)
 import string,types,os
 
 # Modules Eficas
-from PyQt4.QtGui import *
-from PyQt4.QtCore import *
+from determine import monEnvQT5
+if monEnvQT5:
+    from PyQt5.QtCore import  Qt
+else :
+    from PyQt4.QtGui  import *
+    from PyQt4.QtCore import *
 from Extensions.i18n import tr
 
 from feuille               import Feuille
@@ -38,7 +42,8 @@ class MonWidgetSimpBase (Ui_WidgetSimpBase,Feuille):
         #print "MonWidgetSimpBase", nom
         self.parentQt.commandesLayout.insertWidget(-1,self,1)
         self.setFocusPolicy(Qt.StrongFocus)
-        self.connect(self.lineEditVal,SIGNAL("returnPressed()"),self.LEValeurPressed)
+        if monEnvQT5 : self.lineEditVal.returnPressed.connect(self.LEValeurPressed)
+        else :         self.connect(self.lineEditVal,SIGNAL("returnPressed()"),self.LEValeurPressed)
         self.AAfficher=self.lineEditVal
         self.maCommande.listeAffichageWidget.append(self.lineEditVal)
 
@@ -54,20 +59,20 @@ class MonWidgetSimpBase (Ui_WidgetSimpBase,Feuille):
        self.politique=PolitiqueUnique(self.node,self.editor)
        valeur=self.node.item.get_valeur()
        valeurTexte=self.politique.GetValeurTexte(valeur)
-       chaine=QString("")
+       chaine=""
 
        if valeurTexte != None :
           from decimal import Decimal
           if isinstance(valeurTexte,Decimal):
              chaine=str(valeurTexte)
           elif repr(valeurTexte.__class__).find("PARAMETRE") > 0:
-             chaine = QString(repr(valeur))
+             chaine = repr(valeur)
           else :
              #PN ????
              #try :
              #  chaine=QString("").setNum(valeurTexte)
              #except :
-             chaine=QString(str(valeurTexte))
+             chaine=str(valeurTexte)
        self.lineEditVal.setText(chaine)
 
 
index 278b8e1a8938494187d0c9b7147d807ef632c603..bd174677181122ed5b3c6ad455242aa69d8fd20b 100644 (file)
 import string,types,os
 
 # Modules Eficas
-from PyQt4.QtGui import *
-from PyQt4.QtCore import *
+from determine import monEnvQT5
+if monEnvQT5 :
+   from PyQt5.QtWidgets import QRadioButton
+else :
+   from PyQt4.QtGui import *
+   from PyQt4.QtCore import *
 from Extensions.i18n import tr
 
 from feuille               import Feuille
@@ -36,8 +40,12 @@ class MonWidgetSimpBool (Ui_WidgetSimpBool,Feuille):
   def __init__(self,node,monSimpDef,nom,objSimp,parentQt,commande):
         Feuille.__init__(self,node,monSimpDef,nom,objSimp,parentQt,commande)
         self.politique=PolitiqueUnique(self.node,self.editor)
-        self.connect(self.RBTrue,SIGNAL("clicked()"),self.boutonTrueClic)
-        self.connect(self.RBFalse,SIGNAL("clicked()"),self.boutonFalseClic)
+        if monEnvQT5 :
+           self.RBTrue.clicked.connect(self.boutonTrueClic)
+           self.RBFalse.clicked.connect(self.boutonFalseClic)
+        else :
+           self.connect(self.RBTrue,SIGNAL("clicked()"),self.boutonTrueClic)
+           self.connect(self.RBFalse,SIGNAL("clicked()"),self.boutonFalseClic)
         self.parentQt.commandesLayout.insertWidget(-1,self)
         self.maCommande.listeAffichageWidget.append(self.RBTrue)
 
index 64ccda81f6aa5b65f6936e28f3c48dde10faa9ef..6775a18e7d8731e63da034e6b6b04122c1a28a7c 100644 (file)
 import string,types,os
 
 # Modules Eficas
-from PyQt4.QtGui import *
-from PyQt4.QtCore import *
+if monEnvQT5:
+    from PyQt5.QtWidgets import QLineEdit, QRadioButton
+    from PyQt5.QtCore import Qt
+else :
+    from PyQt4.QtGui  import *
+    from PyQt4.QtCore import *
+
+
 from Extensions.i18n import tr
 
 from feuille                import Feuille
@@ -37,11 +43,18 @@ class MonWidgetSimpComplexe (Ui_WidgetSimpComplexe,Feuille):
         Feuille.__init__(self,node,monSimpDef,nom,objSimp,parentQt,commande)
         self.parentQt.commandesLayout.insertWidget(-1,self)
         self.setFocusPolicy(Qt.StrongFocus)
-        self.connect(self.LEImag,SIGNAL("returnPressed()"),self.LEImagRPressed)
-        self.connect(self.LEReel,SIGNAL("returnPressed()"),self.LEReelRPressed)
-        self.connect(self.RBRI,SIGNAL("clicked()"), self.ValeurPressed )
-        self.connect(self.RBMP,SIGNAL("clicked()"), self.ValeurPressed )
-        self.connect(self.LEComp,SIGNAL("returnPressed()"),self.LECompRPressed)
+        if monEnvQT5 :
+          self.LEImag.returnPressed.connect(self.LEImagRPressed)
+          self.LEReel.returnPressed.connect()"),self.LEReelRPressed)
+          self.RBRI.clicked.connect(self.ValeurPressed )
+          self.RBMP.clicked.connect(self.ValeurPressed )
+          self.LEComp.returnPressed.connect(self.LECompRPressed)
+        else :
+          self.connect(self.LEImag,SIGNAL("returnPressed()"),self.LEImagRPressed)
+          self.connect(self.LEReel,SIGNAL("returnPressed()"),self.LEReelRPressed)
+          self.connect(self.RBRI,SIGNAL("clicked()"), self.ValeurPressed )
+          self.connect(self.RBMP,SIGNAL("clicked()"), self.ValeurPressed )
+          self.connect(self.LEComp,SIGNAL("returnPressed()"),self.LECompRPressed)
         self.maCommande.listeAffichageWidget.append(self.LEComp)
         #self.maCommande.listeAffichageWidget.append(self.RBRI)
         #self.maCommande.listeAffichageWidget.append(self.RBMP)
index 429272c688f1359c11aa660a92ff90c4de457866..c116e74a92d296ac0b54abdc1d620567ec43f755 100644 (file)
 import string,types,os,sys
 
 # Modules Eficas
-from PyQt4.QtGui import *
-from PyQt4.QtCore import *
+from determine import  monEnvQT5
+if monEnvQT5 :
+   from PyQt5.QtGui  import QIcon
+   from PyQt5.QtCore import QSize
+else:
+   from PyQt4.QtGui import *
+   from PyQt4.QtCore import *
 from Extensions.i18n import tr
 
 from desWidgetSimpFichier  import Ui_WidgetSimpFichier 
@@ -40,6 +45,4 @@ class MonWidgetSimpFichier (Ui_WidgetSimpFichier,MonWidgetSimpBase):
           icon = QIcon(fichier)
           self.BFichier.setIcon(icon)
           self.BFichier.setIconSize(QSize(32, 32))
-        # deja fait dans MonWidgetSimpBase
-        #self.maCommande.listeAffichageWidget.append(self.lineEditVal)
 
index dc2321ccb0b176fe6ef34150d7b542d4e256d90c..194ac1118a9189795a78309f62506ff0e2d3149c 100644 (file)
 import string,types,os
 
 # Modules Eficas
-from PyQt4.QtGui import *
-from PyQt4.QtCore import *
+if monEnvQT5:
+    from PyQt5.QtWidgets import QLineEdit
+    from PyQt5.QtCore import Qt
+else :
+    from PyQt4.QtGui  import *
+    from PyQt4.QtCore import *
+
 from Extensions.i18n import tr
 
 from feuille               import Feuille
@@ -38,7 +43,8 @@ class MonWidgetSimpSalome (Ui_WidgetSimpSalome,Feuille):
         self.parentQt.commandesLayout.insertWidget(-1,self,1)
         self.setFocusPolicy(Qt.StrongFocus)
         self.politique=PolitiqueUnique(self.node,self.editor)
-        self.connect(self.lineEditVal,SIGNAL("returnPressed()"),self.LEValeurPressed)
+        if monEnvQT5: self.lineEditVal.returnPressed.connect(self.LEValeurPressed)
+        else : self.connect(self.lineEditVal,SIGNAL("returnPressed()"),self.LEValeurPressed)
         self.AAfficher=self.lineEditVal
         self.maCommande.listeAffichageWidget.append(self.lineEditVal)
 
index e77c084fce49b75669f288cc0c36bcb91e287a64..a4e42f8e029acf94563d0ec367110123f03b6563 100644 (file)
 # Modules Python
 import string,types,os
 
+if monEnvQT5:
+    from PyQt5.QtCore import Qt
+else :
+    from PyQt4.QtGui  import *
+    from PyQt4.QtCore import *
+
 # Modules Eficas
-from PyQt4.QtGui import *
-from PyQt4.QtCore import *
 from Extensions.i18n import tr
 
 from feuille               import Feuille
index ec5c421d2684fbaf613f9758fce0e56b0a7d012e..1d45ae5cafa471d6aeecf5a329265dd7654e1e29 100644 (file)
@@ -21,8 +21,8 @@
 import string,types,os
 
 # Modules Eficas
-from PyQt4.QtGui import *
-from PyQt4.QtCore import *
+#from PyQt4.QtGui import *
+#from PyQt4.QtCore import *
 from Extensions.i18n import tr
 
 from feuille               import Feuille
@@ -39,8 +39,8 @@ class MonWidgetSimpTuple2 (Ui_WidgetTuple2,MonWidgetSimpTuple):
         if self.objSimp.isImmuable() :
           self.lineEditVal1.setDisabled(True)
           self.lineEditVal2.setDisabled(True)
-          self.lineEditVal1.setStyleSheet(QString.fromUtf8("background:rgb(244,244,244);\n" "border:0px;\n"))
-          self.lineEditVal2.setStyleSheet(QString.fromUtf8("background:rgb(244,244,244);\n" "border:0px;\n"))
+          self.lineEditVal1.setStyleSheet("background:rgb(244,244,244);\n" "border:0px;\n")
+          self.lineEditVal2.setStyleSheet("background:rgb(244,244,244);\n" "border:0px;\n")
           self.lineEditVal1.setToolTip(tr("Valeur non modifiable"))
           self.lineEditVal2.setToolTip(tr("Valeur non modifiable"))
         else :
index 65156411e22a4165d221c012ce33fd66ac386a92..051102ecafbec14048bb4214051d1e50e686c28d 100644 (file)
@@ -39,9 +39,9 @@ class MonWidgetSimpTuple3 (Ui_WidgetTuple3,MonWidgetSimpTuple):
            self.lineEditVal1.setDisabled(True)
            self.lineEditVal2.setDisabled(True)
            self.lineEditVal3.setDisabled(True)
-           self.lineEditVal1.setStyleSheet(QString.fromUtf8("background:rgb(244,244,244);\n" "border:0px;\n"))
-           self.lineEditVal2.setStyleSheet(QString.fromUtf8("background:rgb(244,244,244);\n" "border:0px;\n"))
-           self.lineEditVal3.setStyleSheet(QString.fromUtf8("background:rgb(244,244,244);\n" "border:0px;\n"))
+           self.lineEditVal1.setStyleSheet("background:rgb(244,244,244);\n" "border:0px;\n")
+           self.lineEditVal2.setStyleSheet("background:rgb(244,244,244);\n" "border:0px;\n")
+           self.lineEditVal3.setStyleSheet("background:rgb(244,244,244);\n" "border:0px;\n")
            self.lineEditVal1.setToolTip(tr("Valeur non modifiable"))
            self.lineEditVal2.setToolTip(tr("Valeur non modifiable"))
            self.lineEditVal3.setToolTip(tr("Valeur non modifiable"))
index c5b6bc99fd428c2c282c0f7c59ccbe7b56dd6cd5..ff41bcff83adab5452d0b4597b552c6e25b4ced4 100755 (executable)
@@ -49,7 +49,8 @@ class Appli(Ui_Eficas,QMainWindow):
         Ui_Eficas.__init__(self)
 
         version=getEficasVersion()
-        self.VERSION_EFICAS="Eficas QT4 "+version
+        self.VERSION_EFICAS="Eficas QT4 Salome "+version
+        if monEnvQT5 : self.VERSION_EFICAS="Eficas QT5 Salome "
         self.salome=salome
         self.ihm="QT"
         self.ssIhm=ssIhm
@@ -554,8 +555,7 @@ class Appli(Ui_Eficas,QMainWindow):
        except : pass
 
     def addToRecentList(self, fn):
-      if not monEnvQT5 : addToRecentListQT4(self, fn); return
-
+      if not monEnvQT5 : self.addToRecentListQT4(fn); return
       while fn in self.recent: self.recent.remove(fn)
       self.recent.insert(0,fn)
       if len(self.recent) > 9:
@@ -683,7 +683,7 @@ class Appli(Ui_Eficas,QMainWindow):
         for rp in self.recent:
             id = self.recentMenu.addAction(rp)
             self.ficRecents[id]=rp
-            if monEnvQT5 : self.id.triggered.connect(self.handleOpenRecent)
+            if monEnvQT5 : id.triggered.connect(self.handleOpenRecent)
             else         : self.connect(id, SIGNAL('triggered()'),self.handleOpenRecent)
         self.recentMenu.addSeparator()
         self.recentMenu.addAction(tr('&Effacer'), self.handleClearRecent)
index d94400835c73d43b88a48c47317941512ca006e0..24782b2eecdea49e7d8dcfba1eb6b92f786074bd 100644 (file)
@@ -275,7 +275,7 @@ class READERCATA:
       widgetChoix = MonChoixCata(self.appliEficas, [cata.user_name for cata in cata_choice_list], title)
       ret=widgetChoix.exec_()
       
-      lab=QString(self.VERSION_EFICAS)+" "
+      lab=str(self.VERSION_EFICAS)+" "
       lab+=tr(" pour ")
       lab+=QString(self.code) 
       lab+=tr(" avec le catalogue ")
index bb2bbb7d727f6673e51c8975d568df7bf8c39893..f19f512635588208e101b4b7d235c65848d9ecbe 100644 (file)
@@ -183,10 +183,10 @@ class PopUpMenuNodeMinimal :
         self.CommAvant.setStatusTip(tr("Insere un commentaire avant la commande "))
 
         self.ParamApres = QAction(tr('apres'),self.tree)
-        self.ParamApres.triggered.connect(self.addParamatersApres)
+        self.ParamApres.triggered.connect(self.addParametersApres)
         self.ParamApres.setStatusTip(tr("Insere un parametre apres la commande "))
         self.ParamAvant = QAction(tr('avant'),self.tree)
-        self.ParamAvant.triggered.connect(self.addParamatersAvant)
+        self.ParamAvant.triggered.connect(self.addParametersAvant)
         self.ParamAvant.setStatusTip(tr("Insere un parametre avant la commande "))
 
         self.Supprime = QAction(tr('Supprimer'),self.tree)
@@ -274,7 +274,7 @@ class PopUpMenuNode(PopUpMenuNodePartiel) :
     def createPopUpMenu(self):
         PopUpMenuNodePartiel.createPopUpMenu(self)
         self.Commente = QAction(tr('ce noeud'),self.tree)
-        self.tree.connect(self.Commente,SIGNAL("triggered()"),self.Commenter)
+        self.Commente.triggered.connect(self.Commenter)
         self.Commente.setStatusTip(tr("commente le noeud "))
         self.commentMenu.addAction(self.Commente)
         self.menu.removeAction(self.Supprime)
index 4d970ad88242877ba355482dea89630160a96d3f..547f6ef810c0f087473e85ee6e09427f8d587459 100644 (file)
@@ -22,7 +22,7 @@ import os, string
 from Extensions.i18n import tr
 from determine import monEnvQT5
 if monEnvQT5:
-   from  PyQt5.QtWidgets  import QFileDialog
+   from  PyQt5.QtWidgets  import QFileDialog, QMessageBox
    from  PyQt5.QtCore  import QFileInfo
 else :
     from PyQt4.QtGui  import *
@@ -77,8 +77,8 @@ class MyTabview:
                         tr('Ouvrir Fichier'),
                         self.appliEficas.CONFIGURATION.savedir,
                          extensions)
-            if fichier.isNull(): 
-              return result
+            if monEnvQT5 : fichier=fichier[0]
+            if not fichier: return result
        fichier = os.path.abspath(unicode(fichier))
        ulfile = os.path.abspath(unicode(fichier))
        self.appliEficas.CONFIGURATION.savedir=os.path.split(ulfile)[0]
@@ -216,8 +216,7 @@ class MyTabview:
            QMessageBox.warning(
                      None,
                      tr("Fichier Duplique"),
-                     tr("Le fichier ne sera pas sauvegarde."),
-                     tr("&Annuler"))
+                     tr("Le fichier ne sera pas sauvegarde."),)
            return
        ok, newName = editor.saveFile()
        if ok :
@@ -233,8 +232,7 @@ class MyTabview:
            QMessageBox.warning(
                      None,
                      tr("Fichier Duplique"),
-                     tr("Le fichier ne sera pas sauvegarde."),
-                     tr("&Annuler"))
+                     tr("Le fichier ne sera pas sauvegarde."),)
            return
        ok, newName = editor.sauveLigneFile()
        if ok :
@@ -274,11 +272,19 @@ class MyTabview:
        for indexEditor in self.dict_editors.keys():
            editor=self.dict_editors[indexEditor]
            if self.samepath(fichier, editor.getFileName()):
-              abort = QMessageBox.warning(self.appliEficas,
-                        tr("Fichier"),
-                        tr("Le fichier <b>%s</b> est deja ouvert.",str(fichier)),
-                        tr("&Duplication"),
-                        tr("&Abort"))
+              if monEnvQT5 :
+                msgBox = QMessageBox()
+                msgBox.setWindowTitle(tr("Fichier"))
+                msgBox.setText(tr("Le fichier <b>%s</b> est deja ouvert", str(fichier)))
+                msgBox.addButton(tr("&Duplication"),0)
+                msgBox.addButton(tr("&Abandonner"),1)
+                abort=msgBox.exec_()
+              else :
+                abort = QMessageBox.warning(self.appliEficas,
+                      tr("Fichier"),
+                      tr("Le fichier <b>%s</b> est deja ouvert.",str(fichier)),
+                      tr("&Duplication"),
+                      tr("&Abort"))
               if abort: break
               double=editor
        else :
@@ -344,7 +350,15 @@ class MyTabview:
         """        
         res=1 
         if (editor.modified) and (editor in self.doubles.keys()) :
-            res = QMessageBox.warning(
+            if monEnvQT5 :
+              msgBox = QMessageBox(None)
+              msgBox.setWindowTitle(tr("Fichier Duplique"))
+              msgBox.setText(tr("Le fichier ne sera pas sauvegarde."))
+              msgBox.addButton(texte,0)
+              msgBox.addButton(tr("&Annuler"),1)
+              res=msgBox.exec_()
+            else:
+              res = QMessageBox.warning(
                      None,
                      tr("Fichier Duplique"),
                      tr("Le fichier ne sera pas sauvegarde."),
@@ -354,9 +368,16 @@ class MyTabview:
             return 2
         if editor.modified:
             fn = editor.getFileName()
-            if fn is None:
-                fn = self.appliEficas.trUtf8('Noname')
-            res = QMessageBox.warning(self.appliEficas, 
+            if fn is None: fn = tr('Noname')
+            if monEnvQT5 :
+              msgBox = QMessageBox(None)
+              msgBox.setWindowTitle(tr("Fichier Duplique"))
+              msgBox.setText(tr("Le fichier ne sera pas sauvegarde."))
+              msgBox.addButton(texte,0)
+              msgBox.addButton(tr("&Annuler"),1)
+              res=msgBox.exec_()
+            else :
+              res = QMessageBox.warning(self.appliEficas, 
                 tr("Fichier Modifie"),
                 tr("Le fichier %s n a pas ete sauvegarde.",str(fn)),
                 tr("&Sauvegarder"),
index e5182e8fbbca79fd640529a9a6034fea12d51a71..916356ed4f156fcf12bcf1348811a50d193eac6d 100644 (file)
@@ -43,6 +43,7 @@ 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 ( Tuple2.ui )
 eficas_compile_ui ( Tuple3.ui )
index 47c13539735faa5dc4e2a947c8a6437ae517cdc2..4dca9db0f6642fcb921ff176d0cce36544beef2f 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,26 @@ border-radius : 12px
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>1226</width>
-        <height>498</height>
+        <width>1240</width>
+        <height>518</height>
        </rect>
       </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">
index a48c8947130f3d1acb97d8238fb9acf7712089a7..2ec16046aa9a532048e4bae764c5efb98b7b2783 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="topMargin">
+       <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 +245,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 +504,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 +660,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">
@@ -591,24 +672,17 @@ border-radius : 12px
          </property>
         </layout>
        </item>
-       <item>
-        <spacer name="verticalSpacer">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>5</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
       </layout>
      </widget>
     </widget>
    </item>
   </layout>
+  <zorder>scrollAreaCommandes</zorder>
+  <zorder>frameAffichage</zorder>
+  <zorder></zorder>
+  <zorder>frame_2</zorder>
+  <zorder>frame_2</zorder>
+  <zorder></zorder>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
@@ -624,6 +698,10 @@ border-radius : 12px
    <header>monLabelClic.h</header>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>scrollAreaCommandes</tabstop>
+  <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/UiQT5/desWidgetFormule.ui b/UiQT5/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 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 c7a1146a02cbd038d31841b4fc8af43768492347..f0c5fbd7c6e583352313e9837d65969caac9a1e7 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 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 \