pour virer les print

diff --git a/InterfaceQT4/browser.py b/InterfaceQT4/browser.py
index 3631c8298cb370d5f0348796c942b7bd78e14cc9..400b3ec98c5034c5c23d25eac9678154b7729f40 100644 (file)
--- a/InterfaceQT4/browser.py
+++ b/InterfaceQT4/browser.py
@@ -145,7 +145,7 @@ class JDCTree( QTreeWidget,GereRegles ):
 
 
     def handleOnItem(self,item,int):
-        print "je passe dans handleOnItem pour ",self, item.item.nom, item, item.item
+        #print "je passe dans handleOnItem pour ",self, item.item.nom, item, item.item
         
         from InterfaceQT4 import composimp
         self.inhibeExpand == True 
@@ -160,8 +160,8 @@ class JDCTree( QTreeWidget,GereRegles ):
               
             estUneFeuille=(isinstance(item,composimp.Node))
              # il faut afficher le parent
-            print "estUneFeuille", estUneFeuille
-            print "afficheCommandesPliees", self.editor.afficheCommandesPliees
+            #print "estUneFeuille", estUneFeuille
+            #print "afficheCommandesPliees", self.editor.afficheCommandesPliees
             if estUneFeuille                        : itemParent.affichePanneau()
             elif self.editor.afficheCommandesPliees : itemParent.plieToutEtReafficheSaufItem(item)
             else                                    : itemParent.affichePanneau()
@@ -172,7 +172,7 @@ class JDCTree( QTreeWidget,GereRegles ):
              #self.tree.handleExpandedItem(item)
              #item.fenetre.donnePremier()
              #item.fenetre.rendActif()
-             print 'il faut afficher le 1er'
+             #print 'il faut afficher le 1er'
         try :
            fr = item.item.get_fr()
            if self.editor: self.editor.affiche_commentaire(unicode(fr))
@@ -623,7 +623,8 @@ class JDCNode(QTreeWidgetItem,GereRegles):
            try :
              self.fenetre.setValide()
            except :
-             print "onValid pour ", self.item.nom, self,'pb'
+            # print "onValid pour ", self.item.nom, self,'pb'
+            pass
 
         if (self.item.nom == "VARIABLE" or self.item.nom == "DISTRIBUTION") and self.item.isvalid():
            self.item.jdc.recalcule_etat_correlation()

diff --git a/InterfaceQT4/composimp.py b/InterfaceQT4/composimp.py
index 9fc5dad99851133e4ce71c5dd7e77d4a1a893fee..6a53e99ddd575cbe42c0da955c0f6805cf6513ba 100644 (file)
--- a/InterfaceQT4/composimp.py
+++ b/InterfaceQT4/composimp.py
@@ -440,7 +440,6 @@ class SIMPTreeItem(Objecttreeitem.AtomicObjectTreeItem):
       return "ast-red-ball"
     else:
       return "ast-yel-ball"
-    print "invalide"
 
   def GetText(self):
     """

diff --git a/InterfaceQT4/editor.py b/InterfaceQT4/editor.py
index d677ab76c673e6357a52b36f7acdf6d394e1381a..aeb17793b26cc194b57240441d34d7f09f1de3ae 100755 (executable)
--- a/InterfaceQT4/editor.py
+++ b/InterfaceQT4/editor.py
@@ -143,7 +143,7 @@ class JDCEditor(Ui_baseWidget,QWidget):
 
         try:
           self.CONFIGURATION.convert_module
-          print self.CONFIGURATION.convert_module
+          #print self.CONFIGURATION.convert_module
           _module = __import__(self.CONFIGURATION.convert_module)
           info = _module.entryPoint()
           convert.plugins.addEntryPoint(info)
@@ -298,6 +298,7 @@ class JDCEditor(Ui_baseWidget,QWidget):
         if self.code == "TELEMAC" : texte=self._newTELEMAC()
         if self.code == "PSEN" : texte = self._newPSEN()
         if self.code == "PSEN_N1" : texte = self._newPSEN_N1()
+        #if self.code == "CF" : texte = self._new_CF()
         #   texte=self.newTexteCND
        
         jdc=self.readercata.cata[0].JdC( procedure =texte,
@@ -1337,7 +1338,7 @@ class JDCEditor(Ui_baseWidget,QWidget):
         for mot in listeAvant :
               ouChercher=ouChercher.get_child(mot,restreint="oui")
         monMC=ouChercher.get_child(MCFils,restreint="oui")
-        if monMC != None : print ouChercher.suppentite(monMC)
+        if monMC != None :  ouChercher.suppentite(monMC)
         ouChercher.state='changed'
         ouChercher.isvalid()
 
@@ -1488,6 +1489,13 @@ class JDCEditor(Ui_baseWidget,QWidget):
         return ligne
 
 
+    #---------------------------#
+    def _new_CF(self):
+    #---------------------------#
+        texte="CONDUITE_FORCEE();"
+        return texte
+
+
     #---------------------------#
     def _newTELEMAC(self):
     #---------------------------#

diff --git a/InterfaceQT4/gereListe.py b/InterfaceQT4/gereListe.py
index e5177936588b478fc7295d62c24d6608eee1a898..4181974c61f290c2de1197b1f7a55187abcf3363 100644 (file)
--- a/InterfaceQT4/gereListe.py
+++ b/InterfaceQT4/gereListe.py
@@ -47,7 +47,7 @@ class LECustom(QLineEdit):
         self.dansUnTuple=False
 
  def focusInEvent(self,event):
-     print "dans focusInEvent de LECustom"
+     #print "dans focusInEvent de LECustom"
      self.parentQt.LineEditEnCours=self
      self.parentQt.NumLineEditEnCours=self.num
      self.parentQt.textSelected=self.text()
@@ -148,7 +148,7 @@ class GereListe:
        self.prepareListeResultatFiltre()
 
    def alphaPushed(self):
-       print "alphaPushed" ,self.alpha
+       #print "alphaPushed" ,self.alpha
        if self.alpha == 1 : return
        self.alpha=1
        self.prepareListeResultat()

diff --git a/InterfaceQT4/monRechercheCatalogue.py b/InterfaceQT4/monRechercheCatalogue.py
index e0c22c641186908497c3b97faa3e9af72cb3ec10..73f4ae165d2beb2a07c3776e4d8e6f966fecaacf 100644 (file)
--- a/InterfaceQT4/monRechercheCatalogue.py
+++ b/InterfaceQT4/monRechercheCatalogue.py
@@ -75,7 +75,6 @@ class DRechercheCatalogue (Ui_desRechercheCatalogue ,QDialog):
       try :
       #if 1  :
         genea= self.editor.readercata.dicoInverse[str(motAChercher)]
-        print genea
         listeGenea=[]
         for t in genea : listeGenea.append(t[0])
         listeGenea.reverse()

diff --git a/InterfaceQT4/monWidgetCommande.py b/InterfaceQT4/monWidgetCommande.py
index 706e23f24464655ff95b98a36b57f7999978d52b..a78385d6322490978325fc2c0a06362a9bf844ae 100644 (file)
--- a/InterfaceQT4/monWidgetCommande.py
+++ b/InterfaceQT4/monWidgetCommande.py
@@ -152,8 +152,9 @@ class MonWidgetCommande(Ui_WidgetCommande,Groupe):
            self.inhibe=0
            return True
          except :
-           print self.listeAffichageWidget
-           print "souci ds focusNextPrevChild"
+           pass
+           #print self.listeAffichageWidget
+           #print "souci ds focusNextPrevChild"
       if i==0 and next==False and not self.inhibe: 
          if hasattr(self.editor.fenetreCentraleAffichee,'scrollArea'):
             self.editor.fenetreCentraleAffichee.scrollArea.ensureWidgetVisible(self.listeAffichageWidget[-1])
@@ -254,11 +255,11 @@ class MonWidgetCommande(Ui_WidgetCommande,Groupe):
 
   def rendVisibleNoeud(self,node):
       self.f=node.fenetre
-      print "dans rendVisibleNoeud",self.f
+      #print "dans rendVisibleNoeud",self.f
       QTimer.singleShot(1, self.rendVisible)
      
   def rendVisible(self):
-      print "dans rendVisible",self.f
+      #print "dans rendVisible",self.f
       QApplication.processEvents()
       self.f.setFocus(7)
       self.editor.fenetreCentraleAffichee.scrollAreaCommandes.ensureWidgetVisible(self.f)

diff --git a/InterfaceQT4/monWidgetCommentaire.py b/InterfaceQT4/monWidgetCommentaire.py
index 1923b38ec057070e0a4b213ac7abdb6ef17dd9f7..0a17449f6cf20620ae55cc9a108b1aab611d51e1 100644 (file)
--- a/InterfaceQT4/monWidgetCommentaire.py
+++ b/InterfaceQT4/monWidgetCommentaire.py
@@ -54,8 +54,10 @@ class MonWidgetCommentaire(QWidget,Ui_WidgetCommentaire,FacultatifOuOptionnel):
 
       if monEnvQT5 :
          self.commentaireTE.textChanged.connect(self.TexteCommentaireEntre)
+         #if self.editor.code in ['MAP','CARMELCND','CF'] : self.bCatalogue.close()
          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'] :
                self.bAvant.close()
                self.bApres.close()
@@ -102,7 +104,6 @@ class MonWidgetCommentaire(QWidget,Ui_WidgetCommentaire,FacultatifOuOptionnel):
 
   def TexteCommentaireEntre(self):
       texte=str(self.commentaireTE.toPlainText())
-      print texte
       self.editor.init_modif()
       self.node.item.set_valeur(texte)
       self.node.update_node_texte()

diff --git a/InterfaceQT4/monWidgetFormule.py b/InterfaceQT4/monWidgetFormule.py
index 49e3f19fac397e60b571f7a96b31bb6747e34112..dc031b96d4234da70cf79172f698db9c75e2ebdc 100644 (file)
--- a/InterfaceQT4/monWidgetFormule.py
+++ b/InterfaceQT4/monWidgetFormule.py
@@ -61,8 +61,10 @@ class MonWidgetFormule(QWidget,Ui_WidgetFormule,FacultatifOuOptionnel):
 
      
       if monEnvQT5 :
+         #if self.editor.code in ['MAP','CARMELCND','CF'] : self.bCatalogue.close()
          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'] : 
                self.bAvant.close()
                self.bApres.close()

diff --git a/InterfaceQT4/monWidgetParam.py b/InterfaceQT4/monWidgetParam.py
index 0190e530e7275b5bb9cf34e48cffe60e40f0e04b..8da3ba64aa6aa82c35d9eed4536b0e2454233518 100644 (file)
--- a/InterfaceQT4/monWidgetParam.py
+++ b/InterfaceQT4/monWidgetParam.py
@@ -54,6 +54,7 @@ class MonWidgetParam(QWidget,Ui_WidgetParam,FacultatifOuOptionnel):
 
       self.setIconePoubelle()
       self.remplit()
+      #if self.editor.code in ['MAP','CARMELCND','CF'] : self.bCatalogue.close()
       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)

diff --git a/InterfaceQT4/monWidgetPlusieursInto.py b/InterfaceQT4/monWidgetPlusieursInto.py
index 1e9aec322bfd25fab9696f51259bf4b852cc2f6e..d667acc88f76fb2009e0499cf0c3f4c82316930d 100644 (file)
--- a/InterfaceQT4/monWidgetPlusieursInto.py
+++ b/InterfaceQT4/monWidgetPlusieursInto.py
@@ -73,8 +73,7 @@ class MonWidgetPlusieursInto (Ui_WidgetPlusieursInto,Feuille,GerePlie,GereListe)
             spacerItem2 = QSpacerItem(40, 70, QSizePolicy.Fixed, QSizePolicy.Minimum)
             self.CBLayout.addItem(spacerItem2)
 
-        if len(self.listeAAfficher) < 8 :
-           self.frameRecherche.close()
+        if len(self.listeAAfficher) < 8 : self.frameRecherche.close()
         # try except si la liste des possibles est vide
         # prevoir qqchose
         try :

diff --git a/InterfaceQT4/monWidgetPlusieursIntoOrdonne.py b/InterfaceQT4/monWidgetPlusieursIntoOrdonne.py
index 487b95dcf9b99361b30194d5397687b95e650ce0..46d060795ccfa5d10b35da7780304d5c3d487434 100644 (file)
--- a/InterfaceQT4/monWidgetPlusieursIntoOrdonne.py
+++ b/InterfaceQT4/monWidgetPlusieursIntoOrdonne.py
@@ -44,7 +44,6 @@ else :
 class MonWidgetPlusieursIntoOrdonne (Ui_WidgetPlusieursIntoOrdonne, Feuille,GereListe,GerePlie):
 
   def __init__(self,node,monSimpDef,nom,objSimp,parent,commande):
-        print "MonWidgetPlusieursInto", nom, self
         self.nomLine="LEResultat"
         self.listeLE=[]
         self.ouAjouter=0
@@ -62,6 +61,9 @@ class MonWidgetPlusieursIntoOrdonne (Ui_WidgetPlusieursIntoOrdonne, Feuille,Gere
           # cas ou on ne peut rien ajouter
           pass 
         self.prepareListeResultat()
+        if len(self.listeAAfficher) < 8 : 
+           self.frameRecherche1.close()
+           self.frameRecherche2.close()
         self.adjustSize()
         if sys.platform[0:5]!="linux":
           repIcon=self.node.editor.appliEficas.repIcon

diff --git a/InterfaceQT4/monWidgetPlusieursTuple.py b/InterfaceQT4/monWidgetPlusieursTuple.py
index 94971e4c5873eacfe32685156b2d871356fe9dbc..50bfbd48e73288997212d7f60f024e28fb5d05f4 100644 (file)
--- a/InterfaceQT4/monWidgetPlusieursTuple.py
+++ b/InterfaceQT4/monWidgetPlusieursTuple.py
@@ -309,7 +309,8 @@ class MonWidgetPlusieursTuple(Feuille,GereListe):
       if not hasattr(self.editor.readercata.cata[0],'sd_moteur') : self.editor.readercata.cata[0].sd_moteur=None
       if self.objSimp.definition.validators.typeDesTuples[0]==self.editor.readercata.cata[0].sd_ligne :
          val=[]
-         for k in self.objSimp.jdc.LineDico.keys() :
+         if  hasattr(self.objSimp.jdc,'LineDico'):
+          for k in self.objSimp.jdc.LineDico.keys() :
               try :
                valeur=self.objSimp.jdc.get_concept(k)
                val.append((valeur,0))
@@ -318,7 +319,8 @@ class MonWidgetPlusieursTuple(Feuille,GereListe):
          self.node.item.set_valeur(val)
       if self.objSimp.definition.validators.typeDesTuples[0]==self.editor.readercata.cata[0].sd_generateur :
          val=[]
-         for k in self.objSimp.jdc.MachineDico.keys() :
+         if  hasattr(self.objSimp.jdc,'MachineDico'):
+          for k in self.objSimp.jdc.MachineDico.keys() :
               try :
                valeur=self.objSimp.jdc.get_concept(k)
                val.append((valeur,0))
@@ -327,7 +329,8 @@ class MonWidgetPlusieursTuple(Feuille,GereListe):
          self.node.item.set_valeur(val)
       if self.objSimp.definition.validators.typeDesTuples[0]==self.editor.readercata.cata[0].sd_transfo :
          val=[]
-         for k in self.objSimp.jdc.TransfoDico.keys() :
+         if  hasattr(self.objSimp.jdc,'TransfoDico'):
+          for k in self.objSimp.jdc.TransfoDico.keys() :
               try :
                valeur=self.objSimp.jdc.get_concept(k)
                val.append((valeur,0))
@@ -336,7 +339,8 @@ class MonWidgetPlusieursTuple(Feuille,GereListe):
          self.node.item.set_valeur(val)
       if self.objSimp.definition.validators.typeDesTuples[0]==self.editor.readercata.cata[0].sd_charge :
          val=[]
-         for k in self.objSimp.jdc.LoadDico.keys() :
+         if  hasattr(self.objSimp.jdc,'LoadDico'):
+          for k in self.objSimp.jdc.LoadDico.keys() :
               try :
                valeur=self.objSimp.jdc.get_concept(k)
                val.append((valeur,0))
@@ -345,7 +349,8 @@ class MonWidgetPlusieursTuple(Feuille,GereListe):
          self.node.item.set_valeur(val)
       if self.objSimp.definition.validators.typeDesTuples[0]==self.editor.readercata.cata[0].sd_moteur :
          val=[]
-         for k in self.objSimp.jdc.MotorDico.keys() :
+         if  hasattr(self.objSimp.jdc,'MotorDico'):
+          for k in self.objSimp.jdc.MotorDico.keys() :
               try :
                valeur=self.objSimp.jdc.get_concept(k)
                val.append((valeur,0))

diff --git a/InterfaceQT4/qtEficas.py b/InterfaceQT4/qtEficas.py
index 4d430fbdd7c9a462a7c6a0fa3cf56bd903835d73..c43c0a42c9c0c33667c4a86ae82764a021a0d578 100755 (executable)
--- a/InterfaceQT4/qtEficas.py
+++ b/InterfaceQT4/qtEficas.py
@@ -129,7 +129,7 @@ class Appli(Ui_Eficas,QMainWindow):
           self.ouvreFichiers()
         #except EficasException, exc:
         except:
-          print "je suis dans le except"
+          #print "je suis dans le except"
           if self.salome == 0 : exit()
 
 
@@ -415,12 +415,13 @@ class Appli(Ui_Eficas,QMainWindow):
         #if Msg == None :
         #   self.viewmanager.handleAjoutGroup(listeGroup)
         #else :
-        print "il faut gerer "
+        #print "il faut gerer "
+        pass
 
 
     def ajoutIcones(self) :
         # Pour pallier les soucis de repertoire d icone
-        print self.repIcon
+        #print self.repIcon
         icon = QIcon(self.repIcon+"/new_file.png")
         self.action_Nouveau.setIcon(icon)
         icon1 = QIcon(self.repIcon+"/ouvrir.png")
@@ -503,8 +504,6 @@ class Appli(Ui_Eficas,QMainWindow):
 
     def connecterSignaux(self) :
 
-        print QApplication.focusChanged
-        #QApplication.focusChanged.connect(self.focusChanged)
         self.recentMenu.aboutToShow.connect(self.handleShowRecentMenu)
         self.action_Nouveau.triggered.connect(self.fileNew)
         self.actionNouvel_Include.triggered.connect(self.NewInclude)
@@ -884,9 +883,6 @@ class Appli(Ui_Eficas,QMainWindow):
       res=self.fileExit()
       if res==2 : event.ignore()
 
-    def focusChanged(self,oldW, newW) :
-      print "jjjjjjjjjjjjjjjjjjjjjjjjjjjjjj"
-      print newW
 
 if __name__=='__main__':
 

diff --git a/UiQT4/desWidgetPlusieursIntoOrdonne.ui b/UiQT4/desWidgetPlusieursIntoOrdonne.ui
index fbaa7a45ebbec4c02adb5ec3dc5ca45c45e612cb..b11bdd72bfd471e627080e08f7a27e6088b41800 100644 (file)
--- a/UiQT4/desWidgetPlusieursIntoOrdonne.ui
+++ b/UiQT4/desWidgetPlusieursIntoOrdonne.ui
@@ -197,83 +197,87 @@
       </spacer>
      </item>
      <item>
-      <layout class="QHBoxLayout" name="horizontalLayout_5">
-       <item>
-        <widget class="QLineEdit" name="LEFiltre">
-         <property name="styleSheet">
-          <string notr="true">background:rgb(255,255,255)
+      <widget class="QFrame" name="frameRecherche1">
+       <layout class="QHBoxLayout" name="horizontalLayout_5">
+        <item>
+         <widget class="QLineEdit" name="LEFiltre">
+          <property name="styleSheet">
+           <string notr="true">background:rgb(255,255,255)
 
 </string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QToolButton" name="PBFind">
-         <property name="minimumSize">
-          <size>
-           <width>21</width>
-           <height>31</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>21</width>
-           <height>31</height>
-          </size>
-         </property>
-         <property name="toolTip">
-          <string>Détruit une ligne</string>
-         </property>
-         <property name="styleSheet">
-          <string notr="true">border : 0px</string>
-         </property>
-         <property name="text">
-          <string>...</string>
-         </property>
-         <property name="icon">
-          <iconset theme="find">
-           <normaloff>../../../.designer/backup</normaloff>../../../.designer/backup</iconset>
-         </property>
-         <property name="iconSize">
-          <size>
-           <width>32</width>
-           <height>32</height>
-          </size>
-         </property>
-        </widget>
-       </item>
-      </layout>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QToolButton" name="PBFind">
+          <property name="minimumSize">
+           <size>
+            <width>21</width>
+            <height>31</height>
+           </size>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>21</width>
+            <height>31</height>
+           </size>
+          </property>
+          <property name="toolTip">
+           <string>Détruit une ligne</string>
+          </property>
+          <property name="styleSheet">
+           <string notr="true">border : 0px</string>
+          </property>
+          <property name="text">
+           <string>...</string>
+          </property>
+          <property name="icon">
+           <iconset theme="find">
+            <normaloff>../../../.designer/backup</normaloff>../../../.designer/backup</iconset>
+          </property>
+          <property name="iconSize">
+           <size>
+            <width>32</width>
+            <height>32</height>
+           </size>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </widget>
      </item>
      <item>
-      <layout class="QHBoxLayout" name="horizontalLayout_6">
-       <item>
-        <widget class="QPushButton" name="PBCata">
-         <property name="text">
-          <string>Catalogue</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="PBAlpha">
-         <property name="text">
-          <string>Alpha</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer name="horizontalSpacer_7">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>40</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
+      <widget class="QFrame" name="frameRecherche2">
+       <layout class="QHBoxLayout" name="horizontalLayout_6">
+        <item>
+         <widget class="QPushButton" name="PBCata">
+          <property name="text">
+           <string>Catalogue</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="PBAlpha">
+          <property name="text">
+           <string>Alpha</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer name="horizontalSpacer_7">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </widget>
      </item>
      <item>
       <spacer name="verticalSpacer_6">
@@ -314,7 +318,7 @@
           <x>0</x>
           <y>0</y>
           <width>18</width>
-          <height>196</height>
+          <height>180</height>
          </rect>
         </property>
         <property name="sizePolicy">
@@ -629,7 +633,7 @@
             </property>
             <property name="icon">
              <iconset>
-              <normaloff>../../../.designer/Editeur/icons/MoinsBleu.png</normaloff>../../../.designer/Editeur/icons/MoinsBleu.png</iconset>
+              <normaloff>../Editeur/icons/MoinsBleu.png</normaloff>../Editeur/icons/MoinsBleu.png</iconset>
             </property>
             <property name="iconSize">
              <size>
@@ -664,7 +668,7 @@
             </property>
             <property name="icon">
              <iconset>
-              <normaloff>../../../.designer/Editeur/icons/PlusBleu.png</normaloff>../../../.designer/Editeur/icons/PlusBleu.png</iconset>
+              <normaloff>../Editeur/icons/PlusBleu.png</normaloff>../Editeur/icons/PlusBleu.png</iconset>
             </property>
             <property name="iconSize">
              <size>
@@ -714,7 +718,7 @@
           </property>
           <property name="icon">
            <iconset>
-            <normaloff>../../../.designer/Editeur/icons/verre-loupe-icone-6087-64.png</normaloff>../../../.designer/Editeur/icons/verre-loupe-icone-6087-64.png</iconset>
+            <normaloff>../Editeur/icons/verre-loupe-icone-6087-64.png</normaloff>../Editeur/icons/verre-loupe-icone-6087-64.png</iconset>
           </property>
           <property name="iconSize">
            <size>

diff --git a/UiQT5/desWidgetPlusieursIntoOrdonne.ui b/UiQT5/desWidgetPlusieursIntoOrdonne.ui
index fbaa7a45ebbec4c02adb5ec3dc5ca45c45e612cb..b11bdd72bfd471e627080e08f7a27e6088b41800 100644 (file)
--- a/UiQT5/desWidgetPlusieursIntoOrdonne.ui
+++ b/UiQT5/desWidgetPlusieursIntoOrdonne.ui
@@ -197,83 +197,87 @@
       </spacer>
      </item>
      <item>
-      <layout class="QHBoxLayout" name="horizontalLayout_5">
-       <item>
-        <widget class="QLineEdit" name="LEFiltre">
-         <property name="styleSheet">
-          <string notr="true">background:rgb(255,255,255)
+      <widget class="QFrame" name="frameRecherche1">
+       <layout class="QHBoxLayout" name="horizontalLayout_5">
+        <item>
+         <widget class="QLineEdit" name="LEFiltre">
+          <property name="styleSheet">
+           <string notr="true">background:rgb(255,255,255)
 
 </string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QToolButton" name="PBFind">
-         <property name="minimumSize">
-          <size>
-           <width>21</width>
-           <height>31</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>21</width>
-           <height>31</height>
-          </size>
-         </property>
-         <property name="toolTip">
-          <string>Détruit une ligne</string>
-         </property>
-         <property name="styleSheet">
-          <string notr="true">border : 0px</string>
-         </property>
-         <property name="text">
-          <string>...</string>
-         </property>
-         <property name="icon">
-          <iconset theme="find">
-           <normaloff>../../../.designer/backup</normaloff>../../../.designer/backup</iconset>
-         </property>
-         <property name="iconSize">
-          <size>
-           <width>32</width>
-           <height>32</height>
-          </size>
-         </property>
-        </widget>
-       </item>
-      </layout>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QToolButton" name="PBFind">
+          <property name="minimumSize">
+           <size>
+            <width>21</width>
+            <height>31</height>
+           </size>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>21</width>
+            <height>31</height>
+           </size>
+          </property>
+          <property name="toolTip">
+           <string>Détruit une ligne</string>
+          </property>
+          <property name="styleSheet">
+           <string notr="true">border : 0px</string>
+          </property>
+          <property name="text">
+           <string>...</string>
+          </property>
+          <property name="icon">
+           <iconset theme="find">
+            <normaloff>../../../.designer/backup</normaloff>../../../.designer/backup</iconset>
+          </property>
+          <property name="iconSize">
+           <size>
+            <width>32</width>
+            <height>32</height>
+           </size>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </widget>
      </item>
      <item>
-      <layout class="QHBoxLayout" name="horizontalLayout_6">
-       <item>
-        <widget class="QPushButton" name="PBCata">
-         <property name="text">
-          <string>Catalogue</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="PBAlpha">
-         <property name="text">
-          <string>Alpha</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer name="horizontalSpacer_7">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>40</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
+      <widget class="QFrame" name="frameRecherche2">
+       <layout class="QHBoxLayout" name="horizontalLayout_6">
+        <item>
+         <widget class="QPushButton" name="PBCata">
+          <property name="text">
+           <string>Catalogue</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="PBAlpha">
+          <property name="text">
+           <string>Alpha</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer name="horizontalSpacer_7">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </widget>
      </item>
      <item>
       <spacer name="verticalSpacer_6">
@@ -314,7 +318,7 @@
           <x>0</x>
           <y>0</y>
           <width>18</width>
-          <height>196</height>
+          <height>180</height>
          </rect>
         </property>
         <property name="sizePolicy">
@@ -629,7 +633,7 @@
             </property>
             <property name="icon">
              <iconset>
-              <normaloff>../../../.designer/Editeur/icons/MoinsBleu.png</normaloff>../../../.designer/Editeur/icons/MoinsBleu.png</iconset>
+              <normaloff>../Editeur/icons/MoinsBleu.png</normaloff>../Editeur/icons/MoinsBleu.png</iconset>
             </property>
             <property name="iconSize">
              <size>
@@ -664,7 +668,7 @@
             </property>
             <property name="icon">
              <iconset>
-              <normaloff>../../../.designer/Editeur/icons/PlusBleu.png</normaloff>../../../.designer/Editeur/icons/PlusBleu.png</iconset>
+              <normaloff>../Editeur/icons/PlusBleu.png</normaloff>../Editeur/icons/PlusBleu.png</iconset>
             </property>
             <property name="iconSize">
              <size>
@@ -714,7 +718,7 @@
           </property>
           <property name="icon">
            <iconset>
-            <normaloff>../../../.designer/Editeur/icons/verre-loupe-icone-6087-64.png</normaloff>../../../.designer/Editeur/icons/verre-loupe-icone-6087-64.png</iconset>
+            <normaloff>../Editeur/icons/verre-loupe-icone-6087-64.png</normaloff>../Editeur/icons/verre-loupe-icone-6087-64.png</iconset>
           </property>
           <property name="iconSize">
            <size>