From 13efc07f7a9646177b60fbfa1fd87170d9083f69 Mon Sep 17 00:00:00 2001
From: "pascale.noyret" <pascale.noyret@edf.fr>
Date: Tue, 4 Oct 2016 15:06:49 +0200
Subject: [PATCH] entete

---
 InterfaceQT4/monWidgetCommande.py |  5 ++++-
 UiQT4/desWidgetCommande.ui        | 32 ++++++++++++++++++-------------
 UiQT5/desWidgetCommande.ui        | 32 ++++++++++++++++++-------------
 3 files changed, 42 insertions(+), 27 deletions(-)

diff --git a/InterfaceQT4/monWidgetCommande.py b/InterfaceQT4/monWidgetCommande.py
index 32da3c15..706e23f2 100644
--- a/InterfaceQT4/monWidgetCommande.py
+++ b/InterfaceQT4/monWidgetCommande.py
@@ -52,8 +52,11 @@ class MonWidgetCommande(Ui_WidgetCommande,Groupe):
       Groupe.__init__(self,node,editor,None,etape.definition,etape,1,self)
       editor.inhibeSplitter=0
 
+      self.frameAffichage.setMinimumHeight(20)
       if node.item.get_fr() != "" : self.labelDoc.setText(node.item.get_fr())
-      else : self.labelDoc.close()
+      else : 
+        self.labelDoc.close()
+        self.frameAffichage.resize(self.frameAffichage.width(),50)
       
       if (etape.get_type_produit()==None): self.LENom.close()
       elif (hasattr(etape, 'sdnom')) and etape.sdnom != "sansnom" and etape.sdnom != None: self.LENom.setText(etape.sdnom) 
diff --git a/UiQT4/desWidgetCommande.ui b/UiQT4/desWidgetCommande.ui
index 0a1d990f..577965c1 100644
--- a/UiQT4/desWidgetCommande.ui
+++ b/UiQT4/desWidgetCommande.ui
@@ -40,7 +40,7 @@ font : 'times' 9px</string>
     <number>0</number>
    </property>
    <item>
-    <widget class="QFrame" name="frameAffichage">
+    <widget class="QWidget" name="frameAffichage" native="true">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
        <horstretch>0</horstretch>
@@ -62,13 +62,16 @@ font : 'times' 9px</string>
      <property name="styleSheet">
       <string notr="true">background-color:rgb(224,223,222)</string>
      </property>
-     <property name="frameShape">
-      <enum>QFrame::NoFrame</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
-     </property>
      <layout class="QGridLayout" name="gridLayout_2">
+      <property name="topMargin">
+       <number>2</number>
+      </property>
+      <property name="bottomMargin">
+       <number>3</number>
+      </property>
+      <property name="verticalSpacing">
+       <number>2</number>
+      </property>
       <item row="0" column="0">
        <widget class="QFrame" name="frame_2">
         <property name="sizePolicy">
@@ -131,7 +134,7 @@ font : 'times' 9px</string>
            </property>
            <property name="icon">
             <iconset>
-             <normaloff>../Editeur/icons/ast-green-ball.png</normaloff>../Editeur/icons/ast-green-ball.png</iconset>
+             <normaloff>../../../.designer/Editeur/icons/ast-green-ball.png</normaloff>../../../.designer/Editeur/icons/ast-green-ball.png</iconset>
            </property>
            <property name="iconSize">
             <size>
@@ -294,7 +297,7 @@ QLineEdit:disabled
              </property>
              <property name="icon">
               <iconset>
-               <normaloff>../Editeur/icons/roue.png</normaloff>../Editeur/icons/roue.png</iconset>
+               <normaloff>../../../.designer/Editeur/icons/roue.png</normaloff>../../../.designer/Editeur/icons/roue.png</iconset>
              </property>
              <property name="iconSize">
               <size>
@@ -351,7 +354,7 @@ QLineEdit:disabled
              </property>
              <property name="icon">
               <iconset>
-               <normaloff>../Editeur/icons/point-interrogation.png</normaloff>../Editeur/icons/point-interrogation.png</iconset>
+               <normaloff>../../../.designer/Editeur/icons/point-interrogation.png</normaloff>../../../.designer/Editeur/icons/point-interrogation.png</iconset>
              </property>
              <property name="iconSize">
               <size>
@@ -389,7 +392,7 @@ QLineEdit:disabled
              </property>
              <property name="icon">
               <iconset>
-               <normaloff>../Editeur/icons/lettreRblanc30.png</normaloff>../Editeur/icons/lettreRblanc30.png</iconset>
+               <normaloff>../../../.designer/Editeur/icons/lettreRblanc30.png</normaloff>../../../.designer/Editeur/icons/lettreRblanc30.png</iconset>
              </property>
              <property name="iconSize">
               <size>
@@ -445,7 +448,7 @@ QLineEdit:disabled
            </property>
            <property name="icon">
             <iconset>
-             <normaloff>../Editeur/icons/deleteRond.png</normaloff>../Editeur/icons/deleteRond.png</iconset>
+             <normaloff>../../../.designer/Editeur/icons/deleteRond.png</normaloff>../../../.designer/Editeur/icons/deleteRond.png</iconset>
            </property>
            <property name="iconSize">
             <size>
@@ -515,6 +518,9 @@ border-radius : 12px
       </item>
       <item row="1" column="1">
        <layout class="QGridLayout" name="gridLayout">
+        <property name="verticalSpacing">
+         <number>0</number>
+        </property>
         <item row="0" column="0">
          <widget class="QPushButton" name="bAvant">
           <property name="sizePolicy">
@@ -615,7 +621,7 @@ border-radius : 12px
           <property name="sizeHint" stdset="0">
            <size>
             <width>20</width>
-            <height>18</height>
+            <height>0</height>
            </size>
           </property>
          </spacer>
diff --git a/UiQT5/desWidgetCommande.ui b/UiQT5/desWidgetCommande.ui
index 0a1d990f..577965c1 100644
--- a/UiQT5/desWidgetCommande.ui
+++ b/UiQT5/desWidgetCommande.ui
@@ -40,7 +40,7 @@ font : 'times' 9px</string>
     <number>0</number>
    </property>
    <item>
-    <widget class="QFrame" name="frameAffichage">
+    <widget class="QWidget" name="frameAffichage" native="true">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
        <horstretch>0</horstretch>
@@ -62,13 +62,16 @@ font : 'times' 9px</string>
      <property name="styleSheet">
       <string notr="true">background-color:rgb(224,223,222)</string>
      </property>
-     <property name="frameShape">
-      <enum>QFrame::NoFrame</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
-     </property>
      <layout class="QGridLayout" name="gridLayout_2">
+      <property name="topMargin">
+       <number>2</number>
+      </property>
+      <property name="bottomMargin">
+       <number>3</number>
+      </property>
+      <property name="verticalSpacing">
+       <number>2</number>
+      </property>
       <item row="0" column="0">
        <widget class="QFrame" name="frame_2">
         <property name="sizePolicy">
@@ -131,7 +134,7 @@ font : 'times' 9px</string>
            </property>
            <property name="icon">
             <iconset>
-             <normaloff>../Editeur/icons/ast-green-ball.png</normaloff>../Editeur/icons/ast-green-ball.png</iconset>
+             <normaloff>../../../.designer/Editeur/icons/ast-green-ball.png</normaloff>../../../.designer/Editeur/icons/ast-green-ball.png</iconset>
            </property>
            <property name="iconSize">
             <size>
@@ -294,7 +297,7 @@ QLineEdit:disabled
              </property>
              <property name="icon">
               <iconset>
-               <normaloff>../Editeur/icons/roue.png</normaloff>../Editeur/icons/roue.png</iconset>
+               <normaloff>../../../.designer/Editeur/icons/roue.png</normaloff>../../../.designer/Editeur/icons/roue.png</iconset>
              </property>
              <property name="iconSize">
               <size>
@@ -351,7 +354,7 @@ QLineEdit:disabled
              </property>
              <property name="icon">
               <iconset>
-               <normaloff>../Editeur/icons/point-interrogation.png</normaloff>../Editeur/icons/point-interrogation.png</iconset>
+               <normaloff>../../../.designer/Editeur/icons/point-interrogation.png</normaloff>../../../.designer/Editeur/icons/point-interrogation.png</iconset>
              </property>
              <property name="iconSize">
               <size>
@@ -389,7 +392,7 @@ QLineEdit:disabled
              </property>
              <property name="icon">
               <iconset>
-               <normaloff>../Editeur/icons/lettreRblanc30.png</normaloff>../Editeur/icons/lettreRblanc30.png</iconset>
+               <normaloff>../../../.designer/Editeur/icons/lettreRblanc30.png</normaloff>../../../.designer/Editeur/icons/lettreRblanc30.png</iconset>
              </property>
              <property name="iconSize">
               <size>
@@ -445,7 +448,7 @@ QLineEdit:disabled
            </property>
            <property name="icon">
             <iconset>
-             <normaloff>../Editeur/icons/deleteRond.png</normaloff>../Editeur/icons/deleteRond.png</iconset>
+             <normaloff>../../../.designer/Editeur/icons/deleteRond.png</normaloff>../../../.designer/Editeur/icons/deleteRond.png</iconset>
            </property>
            <property name="iconSize">
             <size>
@@ -515,6 +518,9 @@ border-radius : 12px
       </item>
       <item row="1" column="1">
        <layout class="QGridLayout" name="gridLayout">
+        <property name="verticalSpacing">
+         <number>0</number>
+        </property>
         <item row="0" column="0">
          <widget class="QPushButton" name="bAvant">
           <property name="sizePolicy">
@@ -615,7 +621,7 @@ border-radius : 12px
           <property name="sizeHint" stdset="0">
            <size>
             <width>20</width>
-            <height>18</height>
+            <height>0</height>
            </size>
           </property>
          </spacer>
-- 
2.39.2