pour essai Adao

diff --git a/Editeur/utils.py b/Editeur/utils.py
index 42a7ab29a0faf77fe7453da7f0506be1c54efc7d..51ae1473bfcf4ba72fd420e3866c4f4587537892 100644 (file)
--- a/Editeur/utils.py
+++ b/Editeur/utils.py
@@ -48,7 +48,7 @@ def get_rep_user(dir):
   if os.path.exists(rep_user_eficas):
     if os.path.isfile(rep_user_eficas) :
       print tr("Un fichier de nom %s existe deja : impossible de creer un repertoire de meme nom", rep_user_eficas)
-      sys.exit(0)
+      rep_user_eficas=None
   else :
     try:
       os.mkdir(rep_user_eficas)

diff --git a/Extensions/localisation.py b/Extensions/localisation.py
index 0c0b67375b2ace710acaa4384b54d8ea03107c84..0b20c79acc9df6488081f0259645c8193a8680d7 100644 (file)
--- a/Extensions/localisation.py
+++ b/Extensions/localisation.py
@@ -15,8 +15,6 @@
 # You should have received a copy of the GNU Lesser General Public License along
 # with this program. If not, see <http://www.gnu.org/licenses/>.
 """
-Creates and loads two ``QTranslator`` objects, one for pure Qt, one for Eficas,
-and installs them to a ``QApplication``.
 
 """
 
@@ -32,17 +30,6 @@ eficas_translator = QTranslator()
 
 def localise(application, locale=None,file=None ):
     """
-    localise(QApplication) -> None
-
-    Loads and installs to a ``QApplication`` two ``QTranslator``
-    objects, one for pure Qt for translating the strings 
-    available in Qt, and one or Eficas, for translating 
-    the strings specified precisely for Eficas.
-    If the Qt base translator cannot be loaded with the locale
-    specified by the user, one attempts to load Qt base 
-    translator with the system locale.
-    If no locale is specified by the user, the system locale
-    is used instead, for both Qt base and Eficas translators.
     """
     if monEnvQT5 :
        from PyQt5.QtCore import QLibraryInfo
@@ -57,40 +44,23 @@ def localise(application, locale=None,file=None ):
 
     sys_locale = QLocale.system().name()
 
-    if locale is None:
-        #locale = sys_locale
-        locale="fr"
-
-    #global qt_translator
-    #if qt_translator.load("qt_" + locale,
-    #                      QLibraryInfo.location(QLibraryInfo.TranslationsPath)):
-    #    application.installTranslator(qt_translator)
-    #elif qt_translator.load("qt_" + sys_locale,
-    #                        QLibraryInfo.location(QLibraryInfo.TranslationsPath)):
-    #    print "Qt base translator with default locale loaded!"
-    #    application.installTranslator(qt_translator)
-        # Try to load Qt base translator according to system locale.
-    #else:
-    #    print "Unable to load Qt base translator!"
+    if locale is None: locale="fr"
     
     global eficas_translator
     if locale=="ang" : locale="en"
-    #print "eficas_" + locale, monPath
+    print "eficas_" + locale, monPath
     if file != None :
-       #print 'chagrement de ', file,monPath
+       print 'chargement de ', file,monPath
        print eficas_translator.load(file,monPath)
        print QApplication.installTranslator(eficas_translator)
        return
      
-
     if eficas_translator.load("eficas_" + locale, monPath):
         QApplication.installTranslator(eficas_translator)
     else:
         print "Unable to load Eficas translator!"
        
 
-    
-
 if __name__ == "__main__":
     import sys
     localise(sys.argv[1])

diff --git a/InterfaceQT4/browser.py b/InterfaceQT4/browser.py
index 9bed683f816ce3b36298fac1a60f91992fe23145..8d1b1702e31971a3e26033c1d5a51a82ec4c81ac 100644 (file)
--- a/InterfaceQT4/browser.py
+++ b/InterfaceQT4/browser.py
@@ -26,7 +26,7 @@ import typeNode
 
 from determine import monEnvQT5
 if monEnvQT5 :
-  from PyQt5.QtWidgets import QTreeWidget , QTreeWidgetItem
+  from PyQt5.QtWidgets import QTreeWidget , QTreeWidgetItem,QApplication
   from PyQt5.QtGui import QIcon
   from PyQt5.QtCore  import Qt
 else :
@@ -78,14 +78,14 @@ class JDCTree( QTreeWidget,GereRegles ):
         self.inhibeExpand=False
         #print "self.editor.afficheCommandesPliees", self.editor.afficheCommandesPliees
         if self.racine.children !=[] :  
-
-            
+           self.editor.initSplitterSizes(3)
            if self.editor.afficheCommandesPliees : self.racine.children[0].plieToutEtReaffiche()
            else : self.racine.children[0].deplieToutEtReaffiche()
-        
-
            self.racine.children[0].fenetre.donnePremier()
-        else : self.racine.affichePanneau()
+        else : 
+          self.editor.initSplitterSizes(2)
+          self.racine.affichePanneau()
+          #print self.editor.splitter.sizes()
         #PNPNPN
         #pdb.set_trace()
 
@@ -332,7 +332,6 @@ class JDCNode(QTreeWidgetItem,GereRegles):
 
 
     def affichePanneau(self) :
-        #if self.item.isactif(): 
         #if self.editor.code == 'ASTER' and not(self.item.isactif()) : 
         # posera des pb si un code decide d appeler FIN un mot clef
         # on resoudera a ce moment la
@@ -347,16 +346,14 @@ class JDCNode(QTreeWidgetItem,GereRegles):
               itemParent.affichePanneau()
               return
            self.fenetre=self.getPanel()
+           self.editor.restoreSplitterSizes()
          
-        #print "hhhhhhhhhh", self.editor.splitter.sizes()
         for indiceWidget in range(self.editor.widgetCentraleLayout.count()):
             widget=self.editor.widgetCentraleLayout.itemAt(indiceWidget)
             self.editor.widgetCentraleLayout.removeItem(widget)
         # ceinture et bretelle
         #print 'old fenetre = ',self.editor.fenetreCentraleAffichee
-        #print "iiiiiiiiiiiiiii", self.editor.splitter.sizes()
         if self.editor.fenetreCentraleAffichee != None : 
-            #print "j enleve ", self.editor.fenetreCentraleAffichee, self.editor.fenetreCentraleAffichee.node.item.nom
             self.editor.widgetCentraleLayout.removeWidget(self.editor.fenetreCentraleAffichee)
             self.editor.fenetreCentraleAffichee.setParent(None)
             self.editor.fenetreCentraleAffichee.close()
@@ -368,11 +365,9 @@ class JDCNode(QTreeWidgetItem,GereRegles):
         self.tree.node_selected= self
 
         if self.editor.first :
-           #self.editor.splitter.setSizes((400,1400,400))
            if not(isinstance(self.fenetre,MonChoixCommande)): self.editor.first=False
         self.tree.inhibeExpand=True
         self.tree.expandItem(self)
-        #self.select()
         self.tree.inhibeExpand=False
         #print "fin de affichePanneau", self.item.nom
         #print "______________________________"
@@ -801,7 +796,6 @@ class JDCNode(QTreeWidgetItem,GereRegles):
         self.inhibeExpand=False
 
     def plieToutEtReaffiche(self):
-        #print "je suis dans plieToutEtReaffiche", self.item.get_nom()
         from InterfaceQT4 import compojdc
         if (isinstance(self, compojdc.Node)) : self.affichePanneau(); return 
         self.inhibeExpand=True
@@ -812,7 +806,6 @@ class JDCNode(QTreeWidgetItem,GereRegles):
             if (isinstance(item,compobloc.Node)) : continue
             item.setPlie()
         self.affichePanneau()
-        self.inhibeExpand=True
 
     def deplieToutEtReaffiche(self):
         self.editor.deplier = True
@@ -919,3 +912,14 @@ class JDCNode(QTreeWidgetItem,GereRegles):
         if node : 
            node.affichePanneau()
            node.select()
+
+    def ouvreLesNoeudsDsLArbre(self):
+        return
+        print "ds ouvreLesNoeudsDsLArbre  ", self.item.nom
+        self.inhibeExpand = True 
+        for i in range(self.childCount()):
+            self.child(i).inhibeExpand=True
+            self.child(i).setExpanded(True)
+            self.child(i).ouvreLesNoeudsDsLArbre()
+            self.child(i).inhibeExpand=False
+        self.inhibeExpand = False 

diff --git a/InterfaceQT4/editor.py b/InterfaceQT4/editor.py
index 9b5ff52f24c6274ef5bf95a7d48f1c07a2cec6e8..cbba87725e1e55806dff04e03b169fc079dd0bbc 100755 (executable)
--- a/InterfaceQT4/editor.py
+++ b/InterfaceQT4/editor.py
@@ -86,7 +86,7 @@ class JDCEditor(Ui_baseWidget,QWidget):
            print "dans JDC pas d appli ????????"
 
         # ces attributs sont mis a jour par definitCode appelee par newEditor
-        self.code = self.appliEficas.CONFIGURATION.code
+        self.code   = self.appliEficas.CONFIGURATION.code
 
         #self.afficheListesPliees=False
         self.afficheListesPliees=True
@@ -97,14 +97,15 @@ class JDCEditor(Ui_baseWidget,QWidget):
         self.closeAutreCommande=self.appliEficas.CONFIGURATION.closeAutreCommande
         self.closeFrameRechercheCommande=self.appliEficas.CONFIGURATION.closeFrameRechercheCommande
         self.affiche=self.appliEficas.CONFIGURATION.affiche
+        #self.taille = self.appliEficas.taille
+
         #if self.code in ['MAP','CARMELCND','PSEN'] : self.afficheCommandesPliees=False
         if self.code in ['MAP','CARMELCND'] : self.afficheCommandesPliees=False
-        if self.code in ['MAP',] : 
+        if self.code in ['MAP',]:
            self.widgetTree.close()
            self.widgetTree=None
-           self.appliEficas.resize(1440,self.appliEficas.height())
-        else :
-           self.appliEficas.resize(1800,self.appliEficas.height())
+
+      
 
         self.version_code = session.d_env.cata
 
@@ -122,8 +123,6 @@ class JDCEditor(Ui_baseWidget,QWidget):
         self.format =  self.appliEficas.format_fichier
 
         self.dict_reels={}
-        self.splitterSizes =  [320,1320,320]
-        self.oldSizeWidgetOptionnel = 320
         self.liste_simp_reel=[]
         self.ihm="QT"
         self.dicoNouveauxMC={}
@@ -162,11 +161,11 @@ class JDCEditor(Ui_baseWidget,QWidget):
         self.node_selected = []
         self.deplier = True
         self.message=''
-        if self.code in ['Adao','MAP'] : self.afficheApresInsert=True
+        if self.code in ['Adao','ADAO','MAP'] : self.afficheApresInsert=True
         else :  self.afficheApresInsert=False
         if self.code in ['TELEMAC',] : self.enteteQTree='premier'
         else : self.enteteQTree='complet'
-        if self.code in ['Adao','TELEMAC'] : self.affichePlie=True
+        if self.code in ['Adao','ADAO','TELEMAC'] : self.affichePlie=True
         else : self.affichePlie=False
 
         self.Commandes_Ordre_Catalogue =self.readercata.Commandes_Ordre_Catalogue
@@ -227,9 +226,7 @@ class JDCEditor(Ui_baseWidget,QWidget):
 
         
         #############
-        self.splitterSizes =  [320,1320,320]
-        self.splitter.setSizes(self.splitterSizes)
-        self.saveSplitterSizes()
+        self.adjustSize()
 
 
     #-------------------#  Pour execution avec output et error dans le bash
@@ -1582,33 +1579,42 @@ class JDCEditor(Ui_baseWidget,QWidget):
       self.nomMaillage="A_partir_de_SMESH"
       self.openfile.close()
 
-    #-------------------------------------
-    def saveSplitterSizes(self,event=None):
-    #------------------------------------
-      if self.inhibeSplitter : return
-      if not hasattr(self,'splitter') : return
-      if self.splitterSizes[2] != 0 : self.oldSizeWidgetOptionnel = self.splitterSizes[2]
-      #print  self.splitterSizes
-      #print self.splitter.sizes()
-      # PNPNPNPN parfoir self.splitter.sizes() a une longueur de 4...
-      nbAGarder=len(self.splitter.sizes())
-      if nbAGarder > 3 : nbAGarder=3
-      for i in range(nbAGarder):
-         self.splitterSizes[i] = self.splitter.sizes()[i]
-         self.splitter.widget(i).resizeEvent=self.saveSplitterSizes
-      #print self.splitter.sizes()
+
+    #-----------------------------------------
+    def initSplitterSizes(self, nbWidget=3):
+    #-----------------------------------------
+       #print "je passe ds initSplitterSizes"
+       if nbWidget==3 :
+          if   self.code in [ 'Adao', 'ADAO', ] : self.splitterSizes=[1,1550,150]
+          elif self.code in [ 'MAP']            : self.splitterSizes=[700,300]
+          else                                  : self.splitterSizes=[300,700,300]
+          self.oldSizeWidgetOptionnel = 30
+       if nbWidget==2 :
+          if   self.code in [ 'Adao', 'ADAO', ] : self.splitterSizes=[5,1500]
+          else                                  : self.splitterSizes=[300,700]
+          self.oldSizeWidgetOptionnel = 30
+       self.splitter.setSizes(self.splitterSizes)
 
 
     #-----------------------------------------
-    def restoreSplitterSizes(self,nbWigdet=3):
+    def restoreSplitterSizes(self,nbWidget=3):
     #----------------------------------------
-      self.inhibeSplitter = 1
-      self.i+=1
+      #self.inhibeSplitter = 1
+      
+      #print 'ds restoreSplitterSizes'
+      #print self.splitterSizes
       if not(hasattr(self,'splitter')) : return
-      newSizes=self.splitterSizes[:nbWigdet]
+      if nbWidget==2 and len(self.splitterSizes) == 3 :
+         self.splitterSizes[1]+=self.splitterSizes[2]
+      newSizes=self.splitterSizes[:nbWidget]
       self.splitter.setSizes(newSizes)
-      self.inhibeSplitter = 0
+      QApplication.processEvents()
+      # seule la fentetre du milieu est necessaire
+      self.splitter.widget(1).resizeEvent=self.saveSplitterSizes
    
+    def saveSplitterSizes(self,event):
+      self.splitterSizes= self.splitter.sizes()
+
     #------------------------
     def fermeOptionnel(self):
     #------------------------
@@ -1629,11 +1635,10 @@ class JDCEditor(Ui_baseWidget,QWidget):
     #------------------------
     def ajoutOptionnel(self):
     #------------------------
-      #print "ajoutOptionnel"
-      #print self.splitterSizes
-      self.splitterSizes[2] = self.oldSizeWidgetOptionnel
-      self.splitterSizes[1] = self.splitterSizes[1] - self.splitterSizes[2]
-      self.inhibeSplitter=0
+      if len(self.splitterSizes) == 2 : self.splitterSizes.append(self.oldSizeWidgetOptionnel)
+      else : self.splitterSizes[2] = self.oldSizeWidgetOptionnel # ceinture pour les close bizarres
+      #self.splitterSizes[1] = self.splitterSizes[1] - self.splitterSizes[2]
+      
       self.restoreSplitterSizes(3)
 
 

diff --git a/InterfaceQT4/gereIcones.py b/InterfaceQT4/gereIcones.py
index 6c6852f463fbc914a9c65f221f235042a5853245..5a77a2e09688ca7ecfd5660d2e7da41dcda27db9 100644 (file)
--- a/InterfaceQT4/gereIcones.py
+++ b/InterfaceQT4/gereIcones.py
@@ -173,7 +173,7 @@ class FacultatifOuOptionnel:
             if self.obj.nom in self.dict_commandes_mesScripts.keys() :
                self.ajoutScript()
                icon=QIcon(self.repIcon+"/roue.png")
-               self.RBRun.setIcon(icon)
+               if hasattr(self,"RBRun"):self.RBRun.setIcon(icon)
                return
       if hasattr(self,"RBRun"): self.RBRun.close()
       if hasattr(self,"CBScripts"): self.CBScripts.close()

diff --git a/InterfaceQT4/monChoixCommande.py b/InterfaceQT4/monChoixCommande.py
index b6c8d235affcfb81b7f1c3ac82b1d427943e0427..a65273872bfdee3f153d040b5de3f586c9dddab7 100644 (file)
--- a/InterfaceQT4/monChoixCommande.py
+++ b/InterfaceQT4/monChoixCommande.py
@@ -22,7 +22,7 @@
 from desChoixCommandes import Ui_ChoixCommandes
 from determine import monEnvQT5
 if monEnvQT5 :
-   from PyQt5.QtWidgets import QWidget, QAction ,QButtonGroup, QRadioButton, QLabel
+   from PyQt5.QtWidgets import QWidget, QAction ,QButtonGroup, QRadioButton, QLabel 
    from PyQt5.QtGui  import QIcon
    from PyQt5.QtCore import QSize
 else :
@@ -62,8 +62,6 @@ class MonChoixCommande(Ui_ChoixCommandes,QWidget):
       self.editor.appliEficas.setWindowTitle(nouveauTitre)
 
 
-      #print self.node.tree
-
       if monEnvQT5 :
          self.RBalpha.clicked.connect(self.afficheAlpha)
          self.RBGroupe.clicked.connect(self.afficheGroupe)
@@ -111,6 +109,7 @@ class MonChoixCommande(Ui_ChoixCommandes,QWidget):
          self.RBOrdre.setChecked(True);  
          self.afficheOrdre()
       if self.editor.closeFrameRechercheCommande == True : self.frameAffichage.close()
+      self.editor.restoreSplitterSizes(2) 
 
   def afficheRegle(self):
       self.node.tree.AppelleBuildLBRegles()
@@ -134,7 +133,7 @@ class MonChoixCommande(Ui_ChoixCommandes,QWidget):
       self.ajouteRadioButtons()
 
   def mouseDoubleClickEvent(self,event):
-      print self.editor.Classement_Commandes_Ds_Arbre
+      #print self.editor.Classement_Commandes_Ds_Arbre
       if self.editor.Classement_Commandes_Ds_Arbre!= () : self.chercheOu()
       nodeCourrant=self.node.tree.currentItem()
       if nodeCourrant==None: nodeCourrant=self.node.tree.racine

diff --git a/InterfaceQT4/monWidgetCommande.py b/InterfaceQT4/monWidgetCommande.py
index 52b88f864a2fc55448fc6077a81beacac62d3c34..e6d8204a1f6af67ab746eea9f23e8ccb9b21dfc0 100644 (file)
--- a/InterfaceQT4/monWidgetCommande.py
+++ b/InterfaceQT4/monWidgetCommande.py
@@ -68,11 +68,7 @@ class MonWidgetCommande(Ui_WidgetCommande,Groupe):
       self.setFont(maPolice)
       self.labelNomCommande.setText(tr(self.obj.nom))
 
-      self.commandesLayout.addStretch()
-      self.commandesLayout.focusInEvent=self.focusInEvent
-      self.scrollAreaCommandes.focusInEvent=self.focusInEvent
 
-     
       if self.editor.closeFrameRechercheCommande==True : self.closeAutreCommande()
       else :
         if monEnvQT5 :
@@ -92,6 +88,9 @@ class MonWidgetCommande(Ui_WidgetCommande,Groupe):
             pass
          self.connect(self.LENom,SIGNAL("returnPressed()"),self.nomChange)
    
+      if self.editor.code in ['Adao','ADAO'] and self.editor.closeFrameRechercheCommande==True  : 
+                      self.frameAffichage.close()
+
       if self.editor.code in ['CARMELCND',] : self.closeAutreCommande()
       self.racine=self.node.tree.racine
       if self.node.item.GetIconName() == "ast-red-square" : self.LENom.setDisabled(True)
@@ -107,17 +106,16 @@ class MonWidgetCommande(Ui_WidgetCommande,Groupe):
       if self.editor.widgetOptionnel!= None : 
         self.monOptionnel=self.editor.widgetOptionnel
       else :
-        self.monOptionnel=MonWidgetOptionnel(self)
+        self.monOptionnel=MonWidgetOptionnel(self.editor)
         self.editor.widgetOptionnel=self.monOptionnel
-        self.editor.inhibeSplitter=1
         self.editor.splitter.addWidget(self.monOptionnel)
-        self.editor.inhibeSplitter=0
         self.editor.ajoutOptionnel()
       self.afficheOptionnel()
+      #self.editor.restoreSplitterSizes()
 
-      self.editor.restoreSplitterSizes()
       #print "fin init de widget Commande"
       
+
   def closeAutreCommande(self):
       self.bCatalogue.close()
       self.bAvant.close()

diff --git a/InterfaceQT4/monWidgetCommentaire.py b/InterfaceQT4/monWidgetCommentaire.py
index 0a17449f6cf20620ae55cc9a108b1aab611d51e1..d1265c27130a4e4c3b52f1ff5997af49e6c8e2ef 100644 (file)
--- a/InterfaceQT4/monWidgetCommentaire.py
+++ b/InterfaceQT4/monWidgetCommentaire.py
@@ -58,7 +58,7 @@ class MonWidgetCommentaire(QWidget,Ui_WidgetCommentaire,FacultatifOuOptionnel):
          if self.editor.code in ['MAP','CARMELCND'] : self.bCatalogue.close()
          else : self.bCatalogue.clicked.connect(self.afficheCatalogue)
          #if self.editor.code in ['Adao','MAP','CF'] :
-         if self.editor.code in ['Adao','MAP'] :
+         if self.editor.code in ['Adao','MAP','ADAO'] :
                self.bAvant.close()
                self.bApres.close()
          else :
@@ -67,7 +67,7 @@ class MonWidgetCommentaire(QWidget,Ui_WidgetCommentaire,FacultatifOuOptionnel):
       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'] :
+         if self.editor.code in ['Adao','MAP','ADAO'] :
                self.bAvant.close()
                self.bApres.close()
          else :

diff --git a/InterfaceQT4/monWidgetFormule.py b/InterfaceQT4/monWidgetFormule.py
index dc031b96d4234da70cf79172f698db9c75e2ebdc..e225b478fa54771c9567c81571d50eaac3d2695d 100644 (file)
--- a/InterfaceQT4/monWidgetFormule.py
+++ b/InterfaceQT4/monWidgetFormule.py
@@ -65,7 +65,7 @@ class MonWidgetFormule(QWidget,Ui_WidgetFormule,FacultatifOuOptionnel):
          if self.editor.code in ['MAP','CARMELCND'] : self.bCatalogue.close()
          else : self.bCatalogue.clicked.connect(self.afficheCatalogue)
          #if self.editor.code in ['Adao','MAP','CF'] : 
-         if self.editor.code in ['Adao','MAP'] : 
+         if self.editor.code in ['Adao','MAP','ADAO'] : 
                self.bAvant.close()
                self.bApres.close()
          else : 

diff --git a/InterfaceQT4/monWidgetOptionnel.py b/InterfaceQT4/monWidgetOptionnel.py
index 69f8cf9554e536229aebea9919ed275425e880a5..19b56b92bf867656e73562ea0bc97c5e7a3ce546 100644 (file)
--- a/InterfaceQT4/monWidgetOptionnel.py
+++ b/InterfaceQT4/monWidgetOptionnel.py
@@ -40,11 +40,6 @@ class  MonWidgetOptionnel (QWidget,Ui_WidgetOptionnel):
      self.setupUi(self)
      self.dicoMCWidgetOptionnel={}
      self.parentQt=parentQt
-     self.parentQt.editor.splitterSizes[1]-=self.parentQt.editor.splitterSizes[2]
-     self.parentQt.editor.splitterSizes[2]=self.parentQt.editor.oldSizeWidgetOptionnel
-     if self.parentQt.editor.splitterSizes[2] == 0 : self.parentQt.editor.splitterSizes[2] = 400
-     self.parentQt.editor.restoreSplitterSizes()
-     self.show()
 
   def afficheOptionnel(self,liste,MC):
      #print "dans Optionnel ____ affiche", liste 
@@ -75,6 +70,9 @@ class  MonWidgetOptionnel (QWidget,Ui_WidgetOptionnel):
             del self.dicoMCWidgetOptionnel[k]
 
   def titre(self,MC):
+     if self.parentCommande.node.editor.code in ['Adao','ADAO'] and self.parentCommande.node.editor.closeFrameRechercheCommande==True :
+        self.frameLabelCommande.close()
+        return
      labeltext,fonte,couleur = self.parentCommande.node.item.GetLabelText()
      l=tr(labeltext)
      li=[]

diff --git a/InterfaceQT4/qtEficas.py b/InterfaceQT4/qtEficas.py
index 080d8e8388452dcf882166cf5342937263705c44..1872094b7bc9adf69aa9a0ad3455699bd087dfe2 100755 (executable)
--- a/InterfaceQT4/qtEficas.py
+++ b/InterfaceQT4/qtEficas.py
@@ -30,6 +30,8 @@ else:
 
 from Extensions.i18n import tr
 from Extensions.eficas_exception import EficasException
+from Extensions import param2
+
 
 from myMain import Ui_Eficas
 from viewManager import MyTabview
@@ -54,6 +56,7 @@ class Appli(Ui_Eficas,QMainWindow):
         self.VERSION_EFICAS="Eficas QT4 Salome "+version
         if monEnvQT5 : self.VERSION_EFICAS="Eficas QT5 Salome "
         self.salome=salome
+        self.parentMainWindow=parent
         self.ihm="QT"
         self.ssIhm=ssIhm
         self.top = self    #(pour CONFIGURATION)
@@ -67,8 +70,8 @@ class Appli(Ui_Eficas,QMainWindow):
         self.ficRecents={}
         self.mesScripts={}
         self.listeAEnlever=[]
-        self.ListePathCode=['Adao','Carmel3D','Telemac','CF','MAP','ZCracks', 'SEP','SPECA','PSEN_Eficas','PSEN_N1']
-        self.listeCode=['Adao','Carmel3D','Telemac','CF','MAP','ZCracks', 'SEP','SPECA','PSEN_Eficas','PSEN_N1']
+        self.ListePathCode=['Adao','ADAO','Carmel3D','Telemac','CF','MAP','ZCracks', 'SEP','SPECA','PSEN_Eficas','PSEN_N1']
+        self.listeCode=['Adao','ADAO','Carmel3D','Telemac','CF','MAP','ZCracks', 'SEP','SPECA','PSEN_Eficas','PSEN_N1']
         self.repIcon=os.path.join( os.path.dirname(os.path.abspath(__file__)),'..','Editeur','icons')
 
 
@@ -86,7 +89,6 @@ class Appli(Ui_Eficas,QMainWindow):
              if code==None: return
 
 
-
         if not self.salome and hasattr (self, 'CONFIGURATION') and hasattr(self.CONFIGURATION,'lang') : langue=self.CONFIGURATION.lang
         if langue=='fr': self.langue=langue
         else           : self.langue="ang"
@@ -94,11 +96,16 @@ class Appli(Ui_Eficas,QMainWindow):
         from Extensions import localisation
         app=QApplication
         localisation.localise(None,langue)
+
         self.setupUi(self)
+        #if parent != None : self.parentCentralWidget = parent.centralWidget()
+        #else              : self.parentCentralWidget = None 
 
+        if  hasattr (self, 'CONFIGURATION') and hasattr(self.CONFIGURATION,'taille') : self.taille=self.CONFIGURATION.taille
+        else : self.taille=1500
 
         if self.code in ['MAP',] : self.resize(1440,self.height())
-        else : self.resize(1800,self.height())
+        else : self.resize(self.taille,self.height())
 
         icon = QIcon(self.repIcon+"/parametres.png")
         self.actionParametres.setIcon(icon)
@@ -109,10 +116,11 @@ class Appli(Ui_Eficas,QMainWindow):
         self.blEntete.insertWidget(0,self.toolBar)
         self.blEntete.insertWidget(0,self.menubar)
 
-        if hasattr (self, 'CONFIGURATION') and self.CONFIGURATION.closeEntete==True : self.closeEntete()
+        if hasattr (self, 'CONFIGURATION') and self.CONFIGURATION.closeEntete==True and self.salome: self.closeEntete()
 
         eficas_root_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
+        #self.resize(20,20)
         self.viewmanager = MyTabview(self)
         self.recentMenu=QMenu(tr('&Recents'))
         #self.menuFichier.insertMenu(self.actionOuvrir,self.recentMenu)
@@ -133,6 +141,7 @@ class Appli(Ui_Eficas,QMainWindow):
         #  print "je suis dans le except"
           #if self.salome == 0 : exit()
 
+        #self.adjustSize()
 
     def closeEntete(self):
         self.menuBar().close()

diff --git a/UiQT4/desGroupeOptionnel.ui b/UiQT4/desGroupeOptionnel.ui
index 217e1fb79c315f4e4cf229db139efd403e712d92..c40c4c227c8ab45ea5a246d02b395ca8590a9417 100644 (file)
--- a/UiQT4/desGroupeOptionnel.ui
+++ b/UiQT4/desGroupeOptionnel.ui
@@ -15,7 +15,7 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <widget class="QFrame" name="frame_2">
+    <widget class="QFrame" name="frameLabelCommande">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
        <horstretch>0</horstretch>
@@ -96,7 +96,7 @@
         <x>0</x>
         <y>0</y>
         <width>382</width>
-        <height>223</height>
+        <height>225</height>
        </rect>
       </property>
       <property name="sizePolicy">

diff --git a/UiQT4/desSelectVal.ui b/UiQT4/desSelectVal.ui
index 34baf93adcfdfb5aa7003d5dd6b2de48c78ffe44..125bae0ea8c01213824e7f300f209e68bdc34fd2 100644 (file)
--- a/UiQT4/desSelectVal.ui
+++ b/UiQT4/desSelectVal.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>633</width>
-    <height>705</height>
+    <width>635</width>
+    <height>744</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -23,6 +23,12 @@
    <string notr="true">background:rgb(235,235,235)</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_3">
+   <property name="spacing">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
    <item>
     <widget class="QTextEdit" name="TBtext">
      <property name="minimumSize">
@@ -243,6 +249,16 @@ border-radius : 12px
      </item>
     </layout>
    </item>
+   <item>
+    <widget class="QLineEdit" name="sb">
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>31</height>
+      </size>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>

diff --git a/UiQT4/desWidgetFact.ui b/UiQT4/desWidgetFact.ui
index ac20023618d1c250c1a5d48cf403fda862125ab2..6add0bb705b44f84ee1def8e0e29b4caf00187d0 100644 (file)
--- a/UiQT4/desWidgetFact.ui
+++ b/UiQT4/desWidgetFact.ui
@@ -27,55 +27,93 @@
      padding: 0 3px;
  }</string>
   </property>
-  <layout class="QHBoxLayout" name="horizontalLayout_3">
+  <layout class="QVBoxLayout" name="verticalLayout_2">
    <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">
+   <property name="margin">
     <number>0</number>
    </property>
    <item>
-    <layout class="QVBoxLayout" name="verticalLayout">
-     <property name="spacing">
-      <number>0</number>
-     </property>
+    <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
-      <spacer name="verticalSpacer">
-       <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>5</height>
-        </size>
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <property name="spacing">
+        <number>0</number>
        </property>
-      </spacer>
+       <item>
+        <spacer name="verticalSpacer">
+         <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>5</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QToolButton" name="RBPlie">
+         <property name="minimumSize">
+          <size>
+           <width>21</width>
+           <height>15</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>21</width>
+           <height>21</height>
+          </size>
+         </property>
+         <property name="styleSheet">
+          <string notr="true">border : 0px</string>
+         </property>
+         <property name="text">
+          <string>...</string>
+         </property>
+         <property name="icon">
+          <iconset>
+           <normaloff>../Editeur/icons/minusnode.png</normaloff>../Editeur/icons/minusnode.png</iconset>
+         </property>
+         <property name="iconSize">
+          <size>
+           <width>21</width>
+           <height>21</height>
+          </size>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_4">
+         <item>
+          <widget class="Line" name="line_7">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+      </layout>
      </item>
      <item>
-      <widget class="QToolButton" name="RBPlie">
+      <widget class="MonBoutonValide" name="RBValide">
        <property name="minimumSize">
         <size>
-         <width>21</width>
-         <height>15</height>
+         <width>17</width>
+         <height>25</height>
         </size>
        </property>
        <property name="maximumSize">
         <size>
          <width>21</width>
-         <height>21</height>
+         <height>25</height>
         </size>
        </property>
        <property name="styleSheet">
@@ -86,48 +124,118 @@
        </property>
        <property name="icon">
         <iconset>
-         <normaloff>../Editeur/icons/minusnode.png</normaloff>../Editeur/icons/minusnode.png</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>21</height>
+         <height>25</height>
         </size>
        </property>
       </widget>
      </item>
      <item>
-      <layout class="QHBoxLayout" name="horizontalLayout_4">
-       <item>
-        <widget class="Line" name="line_7">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QGridLayout" name="gridLayout">
-     <property name="horizontalSpacing">
-      <number>0</number>
-     </property>
-     <item row="0" column="0">
-      <widget class="MonBoutonValide" name="RBValide">
+      <widget class="MonLabelClic" name="GroupBox">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
        <property name="minimumSize">
         <size>
-         <width>17</width>
+         <width>0</width>
          <height>25</height>
         </size>
        </property>
        <property name="maximumSize">
         <size>
-         <width>21</width>
+         <width>12121213</width>
          <height>25</height>
         </size>
        </property>
+       <property name="text">
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;TextLabel&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="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="Line" name="line_4">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>200</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>1500</width>
+         <height>16</height>
+        </size>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </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="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>
@@ -136,195 +244,58 @@
        </property>
        <property name="icon">
         <iconset>
-         <normaloff>../Editeur/icons/ast-green-ball.png</normaloff>../Editeur/icons/ast-green-ball.png</iconset>
+         <normaloff>../../../.designer/Editeur/icons/roue.png</normaloff>../../../.designer/Editeur/icons/roue.png</iconset>
        </property>
        <property name="iconSize">
         <size>
          <width>21</width>
-         <height>25</height>
+         <height>31</height>
         </size>
        </property>
       </widget>
      </item>
-     <item row="0" column="1">
-      <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout_2">
        <property name="spacing">
         <number>0</number>
        </property>
+       <property name="sizeConstraint">
+        <enum>QLayout::SetFixedSize</enum>
+       </property>
        <item>
-        <widget class="MonLabelClic" name="GroupBox">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
+        <widget class="QToolButton" name="RBInfo">
          <property name="minimumSize">
           <size>
-           <width>0</width>
+           <width>21</width>
            <height>25</height>
           </size>
          </property>
          <property name="maximumSize">
           <size>
-           <width>12121213</width>
+           <width>21</width>
            <height>25</height>
           </size>
          </property>
-         <property name="text">
-          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;TextLabel&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer name="horizontalSpacer">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeType">
-          <enum>QSizePolicy::Fixed</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>13</width>
-           <height>20</height>
-          </size>
+         <property name="styleSheet">
+          <string notr="true">border : 0px</string>
          </property>
-        </spacer>
-       </item>
-       <item>
-        <widget class="Line" name="line_4">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
+         <property name="text">
+          <string>...</string>
          </property>
-         <property name="minimumSize">
-          <size>
-           <width>200</width>
-           <height>0</height>
-          </size>
+         <property name="icon">
+          <iconset>
+           <normaloff>../Editeur/icons/point-interrogation30.png</normaloff>../Editeur/icons/point-interrogation30.png</iconset>
          </property>
-         <property name="maximumSize">
+         <property name="iconSize">
           <size>
-           <width>1500</width>
-           <height>16</height>
+           <width>21</width>
+           <height>25</height>
           </size>
          </property>
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </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>
-        <layout class="QHBoxLayout" name="horizontalLayout_2">
-         <property name="spacing">
-          <number>0</number>
-         </property>
-         <property name="sizeConstraint">
-          <enum>QLayout::SetFixedSize</enum>
-         </property>
-         <item>
-          <widget class="QToolButton" name="RBInfo">
-           <property name="minimumSize">
-            <size>
-             <width>21</width>
-             <height>25</height>
-            </size>
-           </property>
-           <property name="maximumSize">
-            <size>
-             <width>21</width>
-             <height>25</height>
-            </size>
-           </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>25</height>
-            </size>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QToolButton" name="RBRegle">
-           <property name="minimumSize">
-            <size>
-             <width>21</width>
-             <height>25</height>
-            </size>
-           </property>
-           <property name="maximumSize">
-            <size>
-             <width>21</width>
-             <height>25</height>
-            </size>
-           </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>25</height>
-            </size>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <spacer name="horizontalSpacer_2">
-         <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">
+        <widget class="QToolButton" name="RBRegle">
          <property name="minimumSize">
           <size>
            <width>21</width>
@@ -345,7 +316,7 @@
          </property>
          <property name="icon">
           <iconset>
-           <normaloff>../Editeur/icons/deleteRond.png</normaloff>../Editeur/icons/deleteRond.png</iconset>
+           <normaloff>../Editeur/icons/lettreRblanc30.png</normaloff>../Editeur/icons/lettreRblanc30.png</iconset>
          </property>
          <property name="iconSize">
           <size>
@@ -357,21 +328,70 @@
        </item>
       </layout>
      </item>
-     <item row="1" column="1">
-      <layout class="QVBoxLayout" name="commandesLayout">
-       <property name="spacing">
-        <number>0</number>
+     <item>
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
        </property>
-       <property name="topMargin">
-        <number>2</number>
+       <property name="sizeType">
+        <enum>QSizePolicy::Fixed</enum>
        </property>
-      </layout>
+       <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>25</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>21</width>
+         <height>25</height>
+        </size>
+       </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>25</height>
+        </size>
+       </property>
+      </widget>
      </item>
     </layout>
    </item>
+   <item>
+    <layout class="QVBoxLayout" name="commandesLayout">
+     <property name="spacing">
+      <number>0</number>
+     </property>
+     <property name="topMargin">
+      <number>2</number>
+     </property>
+    </layout>
+   </item>
   </layout>
   <zorder></zorder>
   <zorder></zorder>
+  <zorder>RBRun</zorder>
  </widget>
  <customwidgets>
   <customwidget>

diff --git a/UiQT4/desWidgetOptionnel.ui b/UiQT4/desWidgetOptionnel.ui
index 079da5da9d18836bc5ca50918bfbb0214e4244d9..6e9e3935078fb67ee7f3e18683312b4c9dc840b1 100644 (file)
--- a/UiQT4/desWidgetOptionnel.ui
+++ b/UiQT4/desWidgetOptionnel.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -30,11 +30,23 @@
 font : 'times' 9px</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
+   <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>
-    <widget class="QFrame" name="frame_2">
+    <widget class="QFrame" name="frameLabelCommande">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
        <horstretch>0</horstretch>
@@ -92,7 +104,7 @@ font : 'times' 9px</string>
    <item>
     <widget class="QWidget" name="widget_2" native="true">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
@@ -116,7 +128,7 @@ font : 'times' 9px</string>
       <item>
        <widget class="QScrollArea" name="scrollAreaCommandesOptionnelles">
         <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+         <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
@@ -138,8 +150,8 @@ font : 'times' 9px</string>
           <rect>
            <x>0</x>
            <y>0</y>
-           <width>279</width>
-           <height>131</height>
+           <width>297</width>
+           <height>146</height>
           </rect>
          </property>
          <property name="sizePolicy">

diff --git a/UiQT5/desChoixCommandes.ui b/UiQT5/desChoixCommandes.ui
index f048c3d2cf7a0da11b7725577061961de2d9ff2e..f6dfb43e80dfc8bdf61adccfb42724e722d7d2d8 100644 (file)
--- a/UiQT5/desChoixCommandes.ui
+++ b/UiQT5/desChoixCommandes.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>1244</width>
-    <height>652</height>
+    <height>262</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -400,6 +400,12 @@ border-radius : 12px
    </item>
    <item>
     <widget class="QScrollArea" name="scrollAreaCommandes">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="styleSheet">
       <string notr="true"/>
      </property>
@@ -418,11 +424,11 @@ border-radius : 12px
         <x>0</x>
         <y>0</y>
         <width>1240</width>
-        <height>518</height>
+        <height>128</height>
        </rect>
       </property>
       <property name="sizePolicy">
-       <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+       <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
         <horstretch>0</horstretch>
         <verstretch>0</verstretch>
        </sizepolicy>

diff --git a/UiQT5/desGroupeOptionnel.ui b/UiQT5/desGroupeOptionnel.ui
index 217e1fb79c315f4e4cf229db139efd403e712d92..3dbe619589eecb73f1a50e40c919afc31f17c967 100644 (file)
--- a/UiQT5/desGroupeOptionnel.ui
+++ b/UiQT5/desGroupeOptionnel.ui
@@ -15,7 +15,7 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <widget class="QFrame" name="frame_2">
+    <widget class="QFrame" name="frameLabelMC">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
        <horstretch>0</horstretch>

diff --git a/UiQT5/desSelectVal.ui b/UiQT5/desSelectVal.ui
index 34baf93adcfdfb5aa7003d5dd6b2de48c78ffe44..125bae0ea8c01213824e7f300f209e68bdc34fd2 100644 (file)
--- a/UiQT5/desSelectVal.ui
+++ b/UiQT5/desSelectVal.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>633</width>
-    <height>705</height>
+    <width>635</width>
+    <height>744</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -23,6 +23,12 @@
    <string notr="true">background:rgb(235,235,235)</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_3">
+   <property name="spacing">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
    <item>
     <widget class="QTextEdit" name="TBtext">
      <property name="minimumSize">
@@ -243,6 +249,16 @@ border-radius : 12px
      </item>
     </layout>
    </item>
+   <item>
+    <widget class="QLineEdit" name="sb">
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>31</height>
+      </size>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>

diff --git a/UiQT5/desWidgetFact.ui b/UiQT5/desWidgetFact.ui
index ac20023618d1c250c1a5d48cf403fda862125ab2..6add0bb705b44f84ee1def8e0e29b4caf00187d0 100644 (file)
--- a/UiQT5/desWidgetFact.ui
+++ b/UiQT5/desWidgetFact.ui
@@ -27,55 +27,93 @@
      padding: 0 3px;
  }</string>
   </property>
-  <layout class="QHBoxLayout" name="horizontalLayout_3">
+  <layout class="QVBoxLayout" name="verticalLayout_2">
    <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">
+   <property name="margin">
     <number>0</number>
    </property>
    <item>
-    <layout class="QVBoxLayout" name="verticalLayout">
-     <property name="spacing">
-      <number>0</number>
-     </property>
+    <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
-      <spacer name="verticalSpacer">
-       <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>5</height>
-        </size>
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <property name="spacing">
+        <number>0</number>
        </property>
-      </spacer>
+       <item>
+        <spacer name="verticalSpacer">
+         <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>5</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QToolButton" name="RBPlie">
+         <property name="minimumSize">
+          <size>
+           <width>21</width>
+           <height>15</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>21</width>
+           <height>21</height>
+          </size>
+         </property>
+         <property name="styleSheet">
+          <string notr="true">border : 0px</string>
+         </property>
+         <property name="text">
+          <string>...</string>
+         </property>
+         <property name="icon">
+          <iconset>
+           <normaloff>../Editeur/icons/minusnode.png</normaloff>../Editeur/icons/minusnode.png</iconset>
+         </property>
+         <property name="iconSize">
+          <size>
+           <width>21</width>
+           <height>21</height>
+          </size>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_4">
+         <item>
+          <widget class="Line" name="line_7">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+      </layout>
      </item>
      <item>
-      <widget class="QToolButton" name="RBPlie">
+      <widget class="MonBoutonValide" name="RBValide">
        <property name="minimumSize">
         <size>
-         <width>21</width>
-         <height>15</height>
+         <width>17</width>
+         <height>25</height>
         </size>
        </property>
        <property name="maximumSize">
         <size>
          <width>21</width>
-         <height>21</height>
+         <height>25</height>
         </size>
        </property>
        <property name="styleSheet">
@@ -86,48 +124,118 @@
        </property>
        <property name="icon">
         <iconset>
-         <normaloff>../Editeur/icons/minusnode.png</normaloff>../Editeur/icons/minusnode.png</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>21</height>
+         <height>25</height>
         </size>
        </property>
       </widget>
      </item>
      <item>
-      <layout class="QHBoxLayout" name="horizontalLayout_4">
-       <item>
-        <widget class="Line" name="line_7">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QGridLayout" name="gridLayout">
-     <property name="horizontalSpacing">
-      <number>0</number>
-     </property>
-     <item row="0" column="0">
-      <widget class="MonBoutonValide" name="RBValide">
+      <widget class="MonLabelClic" name="GroupBox">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
        <property name="minimumSize">
         <size>
-         <width>17</width>
+         <width>0</width>
          <height>25</height>
         </size>
        </property>
        <property name="maximumSize">
         <size>
-         <width>21</width>
+         <width>12121213</width>
          <height>25</height>
         </size>
        </property>
+       <property name="text">
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;TextLabel&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="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="Line" name="line_4">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>200</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>1500</width>
+         <height>16</height>
+        </size>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </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="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>
@@ -136,195 +244,58 @@
        </property>
        <property name="icon">
         <iconset>
-         <normaloff>../Editeur/icons/ast-green-ball.png</normaloff>../Editeur/icons/ast-green-ball.png</iconset>
+         <normaloff>../../../.designer/Editeur/icons/roue.png</normaloff>../../../.designer/Editeur/icons/roue.png</iconset>
        </property>
        <property name="iconSize">
         <size>
          <width>21</width>
-         <height>25</height>
+         <height>31</height>
         </size>
        </property>
       </widget>
      </item>
-     <item row="0" column="1">
-      <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout_2">
        <property name="spacing">
         <number>0</number>
        </property>
+       <property name="sizeConstraint">
+        <enum>QLayout::SetFixedSize</enum>
+       </property>
        <item>
-        <widget class="MonLabelClic" name="GroupBox">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
+        <widget class="QToolButton" name="RBInfo">
          <property name="minimumSize">
           <size>
-           <width>0</width>
+           <width>21</width>
            <height>25</height>
           </size>
          </property>
          <property name="maximumSize">
           <size>
-           <width>12121213</width>
+           <width>21</width>
            <height>25</height>
           </size>
          </property>
-         <property name="text">
-          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;TextLabel&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer name="horizontalSpacer">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeType">
-          <enum>QSizePolicy::Fixed</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>13</width>
-           <height>20</height>
-          </size>
+         <property name="styleSheet">
+          <string notr="true">border : 0px</string>
          </property>
-        </spacer>
-       </item>
-       <item>
-        <widget class="Line" name="line_4">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
+         <property name="text">
+          <string>...</string>
          </property>
-         <property name="minimumSize">
-          <size>
-           <width>200</width>
-           <height>0</height>
-          </size>
+         <property name="icon">
+          <iconset>
+           <normaloff>../Editeur/icons/point-interrogation30.png</normaloff>../Editeur/icons/point-interrogation30.png</iconset>
          </property>
-         <property name="maximumSize">
+         <property name="iconSize">
           <size>
-           <width>1500</width>
-           <height>16</height>
+           <width>21</width>
+           <height>25</height>
           </size>
          </property>
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </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>
-        <layout class="QHBoxLayout" name="horizontalLayout_2">
-         <property name="spacing">
-          <number>0</number>
-         </property>
-         <property name="sizeConstraint">
-          <enum>QLayout::SetFixedSize</enum>
-         </property>
-         <item>
-          <widget class="QToolButton" name="RBInfo">
-           <property name="minimumSize">
-            <size>
-             <width>21</width>
-             <height>25</height>
-            </size>
-           </property>
-           <property name="maximumSize">
-            <size>
-             <width>21</width>
-             <height>25</height>
-            </size>
-           </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>25</height>
-            </size>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QToolButton" name="RBRegle">
-           <property name="minimumSize">
-            <size>
-             <width>21</width>
-             <height>25</height>
-            </size>
-           </property>
-           <property name="maximumSize">
-            <size>
-             <width>21</width>
-             <height>25</height>
-            </size>
-           </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>25</height>
-            </size>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <spacer name="horizontalSpacer_2">
-         <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">
+        <widget class="QToolButton" name="RBRegle">
          <property name="minimumSize">
           <size>
            <width>21</width>
@@ -345,7 +316,7 @@
          </property>
          <property name="icon">
           <iconset>
-           <normaloff>../Editeur/icons/deleteRond.png</normaloff>../Editeur/icons/deleteRond.png</iconset>
+           <normaloff>../Editeur/icons/lettreRblanc30.png</normaloff>../Editeur/icons/lettreRblanc30.png</iconset>
          </property>
          <property name="iconSize">
           <size>
@@ -357,21 +328,70 @@
        </item>
       </layout>
      </item>
-     <item row="1" column="1">
-      <layout class="QVBoxLayout" name="commandesLayout">
-       <property name="spacing">
-        <number>0</number>
+     <item>
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
        </property>
-       <property name="topMargin">
-        <number>2</number>
+       <property name="sizeType">
+        <enum>QSizePolicy::Fixed</enum>
        </property>
-      </layout>
+       <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>25</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>21</width>
+         <height>25</height>
+        </size>
+       </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>25</height>
+        </size>
+       </property>
+      </widget>
      </item>
     </layout>
    </item>
+   <item>
+    <layout class="QVBoxLayout" name="commandesLayout">
+     <property name="spacing">
+      <number>0</number>
+     </property>
+     <property name="topMargin">
+      <number>2</number>
+     </property>
+    </layout>
+   </item>
   </layout>
   <zorder></zorder>
   <zorder></zorder>
+  <zorder>RBRun</zorder>
  </widget>
  <customwidgets>
   <customwidget>

diff --git a/UiQT5/desWidgetOptionnel.ui b/UiQT5/desWidgetOptionnel.ui
index 079da5da9d18836bc5ca50918bfbb0214e4244d9..6e9e3935078fb67ee7f3e18683312b4c9dc840b1 100644 (file)
--- a/UiQT5/desWidgetOptionnel.ui
+++ b/UiQT5/desWidgetOptionnel.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -30,11 +30,23 @@
 font : 'times' 9px</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
+   <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>
-    <widget class="QFrame" name="frame_2">
+    <widget class="QFrame" name="frameLabelCommande">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
        <horstretch>0</horstretch>
@@ -92,7 +104,7 @@ font : 'times' 9px</string>
    <item>
     <widget class="QWidget" name="widget_2" native="true">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
@@ -116,7 +128,7 @@ font : 'times' 9px</string>
       <item>
        <widget class="QScrollArea" name="scrollAreaCommandesOptionnelles">
         <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+         <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
@@ -138,8 +150,8 @@ font : 'times' 9px</string>
           <rect>
            <x>0</x>
            <y>0</y>
-           <width>279</width>
-           <height>131</height>
+           <width>297</width>
+           <height>146</height>
           </rect>
          </property>
          <property name="sizePolicy">