From: pascale.noyret <pascale.noyret@edf.fr>
Date: Fri, 31 Mar 2017 09:12:05 +0000 (+0200)
Subject: pourYoann
X-Git-Tag: V8_3_0~63
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=04c54dd17e239f788d8e21a7dbb582ccd76b90a5;p=tools%2Feficas.git

pourYoann
---

diff --git a/UiQT5/desPBMT.ui b/UiQT5/desPBMT.ui
index a147b615..370539d7 100644
--- a/UiQT5/desPBMT.ui
+++ b/UiQT5/desPBMT.ui
@@ -23,7 +23,8 @@
     </rect>
    </property>
    <property name="styleSheet">
-    <string notr="true">background-color : rgb(168, 227, 142);
+    <string notr="true">/*background-color : rgb(168, 227, 142);rgb(57, 146, 228)*/
+background-color : rgb(66, 165, 238);
 /*border-style : outset;*/
 border-radius : 20px;
 border-width : 30 px;
diff --git a/UiQT5/desWidgetPlusieursBase.ui b/UiQT5/desWidgetPlusieursBase.ui
index 799a330e..fe1cbb7d 100644
--- a/UiQT5/desWidgetPlusieursBase.ui
+++ b/UiQT5/desWidgetPlusieursBase.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>764</width>
-    <height>202</height>
+    <height>86</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -192,7 +192,7 @@ border: 1px solid gray;
      <item>
       <widget class="QScrollArea" name="scrollArea_2">
        <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
+        <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
@@ -211,12 +211,12 @@ border: 1px solid gray;
          <rect>
           <x>0</x>
           <y>0</y>
-          <width>112</width>
-          <height>138</height>
+          <width>300</width>
+          <height>57</height>
          </rect>
         </property>
         <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+         <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
@@ -225,7 +225,7 @@ border: 1px solid gray;
          <item>
           <widget class="QLabel" name="monCommentaireLabel">
            <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="MinimumExpanding">
+            <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
@@ -249,7 +249,7 @@ border: 1px solid gray;
      <item>
       <widget class="QScrollArea" name="scrollArea">
        <property name="sizePolicy">
-        <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+        <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
@@ -278,6 +278,9 @@ border: 1px solid gray;
        <property name="lineWidth">
         <number>1</number>
        </property>
+       <property name="sizeAdjustPolicy">
+        <enum>QAbstractScrollArea::AdjustToContentsOnFirstShow</enum>
+       </property>
        <property name="widgetResizable">
         <bool>true</bool>
        </property>
@@ -290,11 +293,11 @@ border: 1px solid gray;
           <x>0</x>
           <y>0</y>
           <width>398</width>
-          <height>161</height>
+          <height>48</height>
          </rect>
         </property>
         <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+         <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
@@ -338,7 +341,16 @@ border: 1px solid gray;
         <enum>QFrame::Box</enum>
        </property>
        <layout class="QHBoxLayout" name="horizontalLayout_6">
-        <property name="margin">
+        <property name="leftMargin">
+         <number>0</number>
+        </property>
+        <property name="topMargin">
+         <number>0</number>
+        </property>
+        <property name="rightMargin">
+         <number>0</number>
+        </property>
+        <property name="bottomMargin">
          <number>0</number>
         </property>
         <item>
@@ -393,8 +405,7 @@ border: 1px solid gray;
             </property>
             <property name="icon">
              <iconset theme="go-up">
-              <normaloff/>
-             </iconset>
+              <normaloff>.</normaloff>.</iconset>
             </property>
             <property name="iconSize">
              <size>
@@ -432,8 +443,7 @@ border: 1px solid gray;
             </property>
             <property name="icon">
              <iconset theme="go-down">
-              <normaloff/>
-             </iconset>
+              <normaloff>.</normaloff>.</iconset>
             </property>
             <property name="iconSize">
              <size>
@@ -471,8 +481,7 @@ border: 1px solid gray;
             </property>
             <property name="icon">
              <iconset>
-              <normalon>../Editeur/icons/MoinsBleu2.png</normalon>
-             </iconset>
+              <normaloff>../Editeur/icons/MoinsBleu.png</normaloff>../Editeur/icons/MoinsBleu.png</iconset>
             </property>
             <property name="iconSize">
              <size>
@@ -724,8 +733,7 @@ border: 1px solid gray;
          </property>
          <property name="icon">
           <iconset theme="text-x-generic">
-           <normaloff/>
-          </iconset>
+           <normaloff>.</normaloff>.</iconset>
          </property>
          <property name="iconSize">
           <size>
@@ -808,11 +816,6 @@ border: 1px solid gray;
    </item>
   </layout>
   <zorder></zorder>
-  <zorder>label</zorder>
-  <zorder>monCommentaireLabel</zorder>
-  <zorder>scrollArea_2</zorder>
-  <zorder>layoutWidget</zorder>
-  <zorder>verticalSpacer_6</zorder>
  </widget>
  <customwidgets>
   <customwidget>
diff --git a/UiQT5/desWidgetPlusieursIntoOrdonne.ui b/UiQT5/desWidgetPlusieursIntoOrdonne.ui
index 86b75d90..5f3c23bd 100644
--- a/UiQT5/desWidgetPlusieursIntoOrdonne.ui
+++ b/UiQT5/desWidgetPlusieursIntoOrdonne.ui
@@ -39,7 +39,7 @@
     <number>0</number>
    </property>
    <property name="bottomMargin">
-    <number>7</number>
+    <number>15</number>
    </property>
    <item>
     <layout class="QVBoxLayout" name="verticalLayout_3">
@@ -318,7 +318,7 @@
           <x>0</x>
           <y>0</y>
           <width>18</width>
-          <height>180</height>
+          <height>174</height>
          </rect>
         </property>
         <property name="sizePolicy">
@@ -389,7 +389,7 @@
         <x>0</x>
         <y>0</y>
         <width>300</width>
-        <height>527</height>
+        <height>519</height>
        </rect>
       </property>
       <property name="sizePolicy">
@@ -402,7 +402,16 @@
        <property name="spacing">
         <number>0</number>
        </property>
-       <property name="margin">
+       <property name="leftMargin">
+        <number>0</number>
+       </property>
+       <property name="topMargin">
+        <number>0</number>
+       </property>
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
         <number>0</number>
        </property>
        <item>
@@ -477,7 +486,7 @@
             <x>0</x>
             <y>0</y>
             <width>297</width>
-            <height>482</height>
+            <height>474</height>
            </rect>
           </property>
           <property name="sizePolicy">
@@ -490,7 +499,16 @@
            <property name="spacing">
             <number>0</number>
            </property>
-           <property name="margin">
+           <property name="leftMargin">
+            <number>0</number>
+           </property>
+           <property name="topMargin">
+            <number>0</number>
+           </property>
+           <property name="rightMargin">
+            <number>0</number>
+           </property>
+           <property name="bottomMargin">
             <number>0</number>
            </property>
            <item>
@@ -527,7 +545,16 @@
         <property name="spacing">
          <number>0</number>
         </property>
-        <property name="margin">
+        <property name="leftMargin">
+         <number>0</number>
+        </property>
+        <property name="topMargin">
+         <number>0</number>
+        </property>
+        <property name="rightMargin">
+         <number>0</number>
+        </property>
+        <property name="bottomMargin">
          <number>0</number>
         </property>
         <item>
diff --git a/UiQT5/desWidgetPlusieursPlie.ui b/UiQT5/desWidgetPlusieursPlie.ui
index c9dbe943..a69913f6 100644
--- a/UiQT5/desWidgetPlusieursPlie.ui
+++ b/UiQT5/desWidgetPlusieursPlie.ui
@@ -175,50 +175,11 @@
       <layout class="QHBoxLayout" name="horizontalLayout_3">
        <item>
         <widget class="QLineEdit" name="lineEditVal">
-         <property name="enabled">
-          <bool>false</bool>
-         </property>
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-           <horstretch>1</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>0</width>
-           <height>25</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>805</width>
-           <height>16777215</height>
-          </size>
-         </property>
          <property name="styleSheet">
-          <string notr="true">background:rgb(195,195,195);
-border:0px;
-</string>
+          <string notr="true">background:rgb(195,195,195)</string>
          </property>
         </widget>
        </item>
-       <item>
-        <spacer name="horizontalSpacer_2">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeType">
-          <enum>QSizePolicy::MinimumExpanding</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>71</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout_2">
          <property name="spacing">
@@ -321,7 +282,6 @@ border:0px;
   </customwidget>
  </customwidgets>
  <tabstops>
-  <tabstop>lineEditVal</tabstop>
   <tabstop>RBPoubelle</tabstop>
   <tabstop>RBValide</tabstop>
  </tabstops>
diff --git a/UiQT5/desWidgetPlusieursTuple.ui b/UiQT5/desWidgetPlusieursTuple.ui
index 391a2325..36438b0b 100644
--- a/UiQT5/desWidgetPlusieursTuple.ui
+++ b/UiQT5/desWidgetPlusieursTuple.ui
@@ -190,8 +190,8 @@
          <rect>
           <x>0</x>
           <y>0</y>
-          <width>112</width>
-          <height>109</height>
+          <width>82</width>
+          <height>111</height>
          </rect>
         </property>
         <property name="sizePolicy">
@@ -276,7 +276,16 @@
             <property name="spacing">
              <number>0</number>
             </property>
-            <property name="margin">
+            <property name="leftMargin">
+             <number>0</number>
+            </property>
+            <property name="topMargin">
+             <number>0</number>
+            </property>
+            <property name="rightMargin">
+             <number>0</number>
+            </property>
+            <property name="bottomMargin">
              <number>0</number>
             </property>
             <item>
@@ -305,7 +314,16 @@
         <enum>QFrame::Box</enum>
        </property>
        <layout class="QHBoxLayout" name="horizontalLayout_6">
-        <property name="margin">
+        <property name="leftMargin">
+         <number>0</number>
+        </property>
+        <property name="topMargin">
+         <number>0</number>
+        </property>
+        <property name="rightMargin">
+         <number>0</number>
+        </property>
+        <property name="bottomMargin">
          <number>0</number>
         </property>
         <item>
@@ -344,8 +362,7 @@
             </property>
             <property name="icon">
              <iconset theme="go-up">
-              <normaloff/>
-             </iconset>
+              <normaloff>.</normaloff>.</iconset>
             </property>
             <property name="iconSize">
              <size>
@@ -383,8 +400,7 @@
             </property>
             <property name="icon">
              <iconset theme="go-down">
-              <normaloff/>
-             </iconset>
+              <normaloff>.</normaloff>.</iconset>
             </property>
             <property name="iconSize">
              <size>
@@ -417,13 +433,9 @@
             <property name="styleSheet">
              <string notr="true">border : 0px</string>
             </property>
-            <property name="text">
-             <string>...</string>
-            </property>
             <property name="icon">
              <iconset>
-              <normalon>../Editeur/icons/MoinsBleu2.png</normalon>
-             </iconset>
+              <normaloff>../Editeur/icons/MoinsBleu.png</normaloff>../Editeur/icons/MoinsBleu.png</iconset>
             </property>
             <property name="iconSize">
              <size>
@@ -567,8 +579,7 @@
          </property>
          <property name="icon">
           <iconset theme="text-x-generic">
-           <normaloff/>
-          </iconset>
+           <normaloff>.</normaloff>.</iconset>
          </property>
          <property name="iconSize">
           <size>