From b34c29bdf2df3f6aa21229c961cde0b84887ddf6 Mon Sep 17 00:00:00 2001
From: "pascale.noyret" <pascale.noyret@edf.fr>
Date: Wed, 11 Sep 2019 17:48:09 +0200
Subject: [PATCH] pour MT bug sur Zone

---
 InterfaceQT4/browser.py                |  13 +-
 UiQT5/desWidgetFact.ui                 |   5 +-
 UiQT5/desWidgetPlusieursBase.ui        | 276 ++++++++++---------------
 UiQT5/desWidgetPlusieursIntoOrdonne.ui |  20 +-
 UiQT5/desWidgetPlusieursTuple.ui       |   9 +-
 5 files changed, 133 insertions(+), 190 deletions(-)

diff --git a/InterfaceQT4/browser.py b/InterfaceQT4/browser.py
index 7d4b71f7..76230250 100644
--- a/InterfaceQT4/browser.py
+++ b/InterfaceQT4/browser.py
@@ -160,21 +160,22 @@ class JDCTree( QTreeWidget,GereRegles ):
         self.inhibeExpand = True 
         self.itemCourant=item
         itemParent=item
+        itemAvant=item
 
         while not (hasattr (itemParent,'getPanel')) : 
            if itemParent.plie==True : itemParent.setDeplie()
            itemAvant=itemParent
            itemParent=itemParent.treeParent 
 
+    
         if itemParent.fenetre != self.editor.fenetreCentraleAffichee : 
             estUneFeuille=(isinstance(item,composimp.Node))
-             # il faut afficher le parent
-            if estUneFeuille and itemParent.fenetreIhm=='deplie1Niveau' : 
-               itemAvant.afficheCeNiveau()
-               return
-            if estUneFeuille                        : itemParent.affichePanneau()
+            if itemParent.fenetreIhm == 'deplie1Niveau' :
+               if item == itemParent : itemParent.affichePanneau()
+               else                  : itemAvant.afficheCeNiveau()
+            elif estUneFeuille       : itemParent.affichePanneau()
             elif self.editor.maConfiguration.afficheCommandesPliees : itemParent.plieToutEtReafficheSaufItem(item)
-            else                                    : itemParent.affichePanneau()
+            else                     :  itemParent.affichePanneau()
 
 
         elif (isinstance(item,composimp.Node)) and item.fenetre : item.fenetre.rendVisible()
diff --git a/UiQT5/desWidgetFact.ui b/UiQT5/desWidgetFact.ui
index 9a0d006f..c7f86cb3 100644
--- a/UiQT5/desWidgetFact.ui
+++ b/UiQT5/desWidgetFact.ui
@@ -433,8 +433,7 @@
           <string>...</string>
          </property>
          <property name="icon">
-          <iconset>
-           <normaloff>../Editeur/icons/PlusBleu.png</normaloff>../Editeur/icons/PlusBleu.png</iconset>
+          <iconset theme="add"/>
          </property>
          <property name="iconSize">
           <size>
@@ -493,8 +492,6 @@
   </layout>
   <zorder></zorder>
   <zorder></zorder>
-  <zorder>verticalSpacer_2</zorder>
-  <zorder>line_7</zorder>
   <zorder></zorder>
  </widget>
  <customwidgets>
diff --git a/UiQT5/desWidgetPlusieursBase.ui b/UiQT5/desWidgetPlusieursBase.ui
index 8d7d5a9d..b4d801dc 100644
--- a/UiQT5/desWidgetPlusieursBase.ui
+++ b/UiQT5/desWidgetPlusieursBase.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1122</width>
-    <height>163</height>
+    <width>1002</width>
+    <height>91</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -26,12 +26,9 @@
    <string>Form</string>
   </property>
   <property name="styleSheet">
-   <string notr="true">/* QFrame {
-border: 1px solid gray;
-}*/
-</string>
+   <string notr="true"/>
   </property>
-  <layout class="QHBoxLayout" name="horizontalLayout_2">
+  <layout class="QHBoxLayout" name="horizontalLayout_5">
    <property name="spacing">
     <number>0</number>
    </property>
@@ -42,10 +39,10 @@ border: 1px solid gray;
     <number>2</number>
    </property>
    <property name="rightMargin">
-    <number>2</number>
+    <number>0</number>
    </property>
    <property name="bottomMargin">
-    <number>0</number>
+    <number>2</number>
    </property>
    <item>
     <layout class="QVBoxLayout" name="verticalLayout_3">
@@ -212,7 +209,7 @@ border: 1px solid gray;
           <x>0</x>
           <y>0</y>
           <width>300</width>
-          <height>101</height>
+          <height>60</height>
          </rect>
         </property>
         <property name="sizePolicy">
@@ -264,13 +261,10 @@ border: 1px solid gray;
    </item>
    <item>
     <layout class="QVBoxLayout" name="verticalLayout_2">
-     <property name="spacing">
-      <number>0</number>
-     </property>
      <item>
       <widget class="QScrollArea" name="scrollArea">
        <property name="sizePolicy">
-        <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
+        <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
@@ -278,20 +272,14 @@ border: 1px solid gray;
        <property name="minimumSize">
         <size>
          <width>400</width>
-         <height>50</height>
+         <height>20</height>
         </size>
        </property>
        <property name="styleSheet">
-        <string notr="true">background : rgb(247,247,247);
-border: 1px solid gray;
-/* QFrame {
-border: 1px solid gray;
-}*/
-
-</string>
+        <string notr="true"/>
        </property>
        <property name="frameShape">
-        <enum>QFrame::Box</enum>
+        <enum>QFrame::NoFrame</enum>
        </property>
        <property name="frameShadow">
         <enum>QFrame::Plain</enum>
@@ -310,19 +298,19 @@ border: 1px solid gray;
          <rect>
           <x>0</x>
           <y>0</y>
-          <width>705</width>
-          <height>122</height>
+          <width>589</width>
+          <height>44</height>
          </rect>
         </property>
         <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
+         <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
         <layout class="QVBoxLayout" name="verticalLayoutLE">
          <property name="spacing">
-          <number>2</number>
+          <number>0</number>
          </property>
          <property name="leftMargin">
           <number>2</number>
@@ -337,14 +325,17 @@ border: 1px solid gray;
           <number>0</number>
          </property>
          <item>
-          <spacer name="verticalSpacer_2">
+          <spacer name="verticalSpacer_3">
            <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>40</height>
+             <height>1</height>
             </size>
            </property>
           </spacer>
@@ -354,40 +345,21 @@ border: 1px solid gray;
       </widget>
      </item>
      <item>
-      <widget class="QFrame" name="frame">
-       <property name="frameShape">
-        <enum>QFrame::Box</enum>
+      <layout class="QHBoxLayout" name="horizontalLayout_2">
+       <property name="sizeConstraint">
+        <enum>QLayout::SetFixedSize</enum>
        </property>
-       <layout class="QHBoxLayout" name="horizontalLayout_6">
-        <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>
-         <spacer name="horizontalSpacer_5">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Fixed</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>13</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
+       <item>
+        <widget class="QFrame" name="frame2">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="frameShape">
+          <enum>QFrame::Box</enum>
+         </property>
          <layout class="QHBoxLayout" name="horizontalLayout_4">
           <property name="spacing">
            <number>0</number>
@@ -395,8 +367,20 @@ border: 1px solid gray;
           <property name="sizeConstraint">
            <enum>QLayout::SetFixedSize</enum>
           </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="QToolButton" name="RBHaut">
+           <widget class="QToolButton" name="RBBas">
             <property name="minimumSize">
              <size>
               <width>21</width>
@@ -413,7 +397,7 @@ border: 1px solid gray;
              <enum>Qt::ClickFocus</enum>
             </property>
             <property name="toolTip">
-             <string>Remonte la ligne</string>
+             <string>Descend la ligne</string>
             </property>
             <property name="styleSheet">
              <string notr="true">border : 0px</string>
@@ -422,7 +406,7 @@ border: 1px solid gray;
              <string>...</string>
             </property>
             <property name="icon">
-             <iconset theme="go-up">
+             <iconset theme="go-down">
               <normaloff>.</normaloff>.</iconset>
             </property>
             <property name="iconSize">
@@ -434,7 +418,7 @@ border: 1px solid gray;
            </widget>
           </item>
           <item>
-           <widget class="QToolButton" name="RBBas">
+           <widget class="QToolButton" name="RBHaut">
             <property name="minimumSize">
              <size>
               <width>21</width>
@@ -451,7 +435,7 @@ border: 1px solid gray;
              <enum>Qt::ClickFocus</enum>
             </property>
             <property name="toolTip">
-             <string>Descend la ligne</string>
+             <string>Remonte la ligne</string>
             </property>
             <property name="styleSheet">
              <string notr="true">border : 0px</string>
@@ -460,7 +444,7 @@ border: 1px solid gray;
              <string>...</string>
             </property>
             <property name="icon">
-             <iconset theme="go-down">
+             <iconset theme="go-up">
               <normaloff>.</normaloff>.</iconset>
             </property>
             <property name="iconSize">
@@ -498,8 +482,7 @@ border: 1px solid gray;
              <string>...</string>
             </property>
             <property name="icon">
-             <iconset>
-              <normaloff>../Editeur/icons/MoinsBleu.png</normaloff>../Editeur/icons/MoinsBleu.png</iconset>
+             <iconset theme="remove"/>
             </property>
             <property name="iconSize">
              <size>
@@ -536,8 +519,7 @@ border: 1px solid gray;
              <string>...</string>
             </property>
             <property name="icon">
-             <iconset>
-              <normaloff>../Editeur/icons/PlusBleu.png</normaloff>../Editeur/icons/PlusBleu.png</iconset>
+             <iconset theme="add"/>
             </property>
             <property name="iconSize">
              <size>
@@ -547,88 +529,8 @@ border: 1px solid gray;
             </property>
            </widget>
           </item>
-         </layout>
-        </item>
-        <item>
-         <spacer name="horizontalSpacer_2">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Minimum</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class="QToolButton" name="RBVoisListe">
-          <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>Montre l'ensemble des valeurs</string>
-          </property>
-          <property name="styleSheet">
-           <string notr="true">border : 0px</string>
-          </property>
-          <property name="text">
-           <string>...</string>
-          </property>
-          <property name="icon">
-           <iconset>
-            <normaloff>../Editeur/icons/verre-loupe-icone-6087-64.png</normaloff>../Editeur/icons/verre-loupe-icone-6087-64.png</iconset>
-          </property>
-          <property name="iconSize">
-           <size>
-            <width>32</width>
-            <height>32</height>
-           </size>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer name="horizontalSpacer_4">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Minimum</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <layout class="QHBoxLayout" name="horizontalLayout_5">
-          <property name="spacing">
-           <number>0</number>
-          </property>
-          <property name="sizeConstraint">
-           <enum>QLayout::SetFixedSize</enum>
-          </property>
           <item>
-           <widget class="QToolButton" name="RBSalome">
+           <widget class="QToolButton" name="RBVoisListe">
             <property name="minimumSize">
              <size>
               <width>21</width>
@@ -645,7 +547,7 @@ border: 1px solid gray;
              <enum>Qt::ClickFocus</enum>
             </property>
             <property name="toolTip">
-             <string>Sélectionne depuis Salome</string>
+             <string>Montre l'ensemble des valeurs</string>
             </property>
             <property name="styleSheet">
              <string notr="true">border : 0px</string>
@@ -654,8 +556,7 @@ border: 1px solid gray;
              <string>...</string>
             </property>
             <property name="icon">
-             <iconset>
-              <normaloff>../Editeur/icons/flecheSalome.png</normaloff>../Editeur/icons/flecheSalome.png</iconset>
+             <iconset theme="find"/>
             </property>
             <property name="iconSize">
              <size>
@@ -703,10 +604,61 @@ border: 1px solid gray;
             </property>
            </widget>
           </item>
+          <item>
+           <widget class="QToolButton" name="RBSalome">
+            <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>Sélectionne depuis Salome</string>
+            </property>
+            <property name="styleSheet">
+             <string notr="true">border : 0px</string>
+            </property>
+            <property name="text">
+             <string>...</string>
+            </property>
+            <property name="icon">
+             <iconset>
+              <normaloff>../Editeur/icons/flecheSalome.png</normaloff>../Editeur/icons/flecheSalome.png</iconset>
+            </property>
+            <property name="iconSize">
+             <size>
+              <width>32</width>
+              <height>32</height>
+             </size>
+            </property>
+           </widget>
+          </item>
          </layout>
-        </item>
-       </layout>
-      </widget>
+        </widget>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
      </item>
     </layout>
    </item>
@@ -848,13 +800,7 @@ border: 1px solid gray;
   </customwidget>
  </customwidgets>
  <tabstops>
-  <tabstop>scrollArea</tabstop>
-  <tabstop>RBHaut</tabstop>
-  <tabstop>RBBas</tabstop>
   <tabstop>RBMoins</tabstop>
-  <tabstop>RBVoisListe</tabstop>
-  <tabstop>RBSalome</tabstop>
-  <tabstop>RBSalomeVue</tabstop>
   <tabstop>BSelectFichier</tabstop>
   <tabstop>RBPoubelle</tabstop>
  </tabstops>
diff --git a/UiQT5/desWidgetPlusieursIntoOrdonne.ui b/UiQT5/desWidgetPlusieursIntoOrdonne.ui
index a893b65e..832a9176 100644
--- a/UiQT5/desWidgetPlusieursIntoOrdonne.ui
+++ b/UiQT5/desWidgetPlusieursIntoOrdonne.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1013</width>
+    <width>1386</width>
     <height>538</height>
    </rect>
   </property>
@@ -353,7 +353,7 @@
           <x>0</x>
           <y>0</y>
           <width>18</width>
-          <height>174</height>
+          <height>189</height>
          </rect>
         </property>
         <property name="sizePolicy">
@@ -423,7 +423,7 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>300</width>
+        <width>425</width>
         <height>519</height>
        </rect>
       </property>
@@ -520,7 +520,7 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>297</width>
+            <width>421</width>
             <height>474</height>
            </rect>
           </property>
@@ -694,8 +694,8 @@
              <string>...</string>
             </property>
             <property name="icon">
-             <iconset>
-              <normaloff>../Editeur/icons/MoinsBleu.png</normaloff>../Editeur/icons/MoinsBleu.png</iconset>
+             <iconset theme="remove">
+              <normaloff>.</normaloff>.</iconset>
             </property>
             <property name="iconSize">
              <size>
@@ -729,8 +729,8 @@
              <string>...</string>
             </property>
             <property name="icon">
-             <iconset>
-              <normaloff>../Editeur/icons/PlusBleu.png</normaloff>../Editeur/icons/PlusBleu.png</iconset>
+             <iconset theme="add">
+              <normaloff>.</normaloff>.</iconset>
             </property>
             <property name="iconSize">
              <size>
@@ -779,8 +779,8 @@
            <string>...</string>
           </property>
           <property name="icon">
-           <iconset>
-            <normaloff>../Editeur/icons/verre-loupe-icone-6087-64.png</normaloff>../Editeur/icons/verre-loupe-icone-6087-64.png</iconset>
+           <iconset theme="find">
+            <normaloff>.</normaloff>.</iconset>
           </property>
           <property name="iconSize">
            <size>
diff --git a/UiQT5/desWidgetPlusieursTuple.ui b/UiQT5/desWidgetPlusieursTuple.ui
index bbb59be7..1b4ccfbf 100644
--- a/UiQT5/desWidgetPlusieursTuple.ui
+++ b/UiQT5/desWidgetPlusieursTuple.ui
@@ -222,7 +222,7 @@
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>265</width>
+             <width>270</width>
              <height>307</height>
             </rect>
            </property>
@@ -394,7 +394,7 @@
              <string notr="true">border : 0px</string>
             </property>
             <property name="icon">
-             <iconset>
+             <iconset theme="remove">
               <normaloff>../Editeur/icons/MoinsBleu.png</normaloff>../Editeur/icons/MoinsBleu.png</iconset>
             </property>
             <property name="iconSize">
@@ -432,7 +432,7 @@
              <string>...</string>
             </property>
             <property name="icon">
-             <iconset>
+             <iconset theme="add">
               <normaloff>../Editeur/icons/PlusBleu.png</normaloff>../Editeur/icons/PlusBleu.png</iconset>
             </property>
             <property name="iconSize">
@@ -488,8 +488,7 @@
            <string>...</string>
           </property>
           <property name="icon">
-           <iconset>
-            <normaloff>../Editeur/icons/verre-loupe-icone-6087-64.png</normaloff>../Editeur/icons/verre-loupe-icone-6087-64.png</iconset>
+           <iconset theme="find"/>
           </property>
           <property name="iconSize">
            <size>
-- 
2.39.2