ajout du bouton + pour les fact avec max = **

diff --git a/InterfaceQT4/monWidgetFact.py b/InterfaceQT4/monWidgetFact.py
index 38f5805b86f4fb244296e75acfae545656752984..d756cb28cdf3539963f5c0d390cd99a8c882e3be 100644 (file)
--- a/InterfaceQT4/monWidgetFact.py
+++ b/InterfaceQT4/monWidgetFact.py
@@ -41,6 +41,9 @@ class MonWidgetFactCommun(Groupe):
       self.GroupBox.setTextInteractionFlags(Qt.TextSelectableByMouse)
       self.parentQt.commandesLayout.insertWidget(insertIn,self)
       self.doitAfficherOptionnel=False
+      min,max=obj.getMinMax()
+      if max < 2 and  hasattr(self, 'RBPlus') : self.RBPlus.close() 
+      if max > 1 and  hasattr(self, 'RBPlus') : self.RBPlus.clicked.connect(self.ajouteMCParPB)
 
   def enterEvent(self,event):
       #print "enterEvent ", self.node.item.getLabelText()[0]
@@ -57,6 +60,14 @@ class MonWidgetFactCommun(Groupe):
       #print "delayAffiche, self.doitAfficherOptionnel = ", self.doitAfficherOptionnel
       if self.doitAfficherOptionnel and self.editor.code != "CARMELCND" :self.afficheOptionnel()
 
+  def ajouteMCParPB(self):
+      texteListeNom="+"+self.obj.nom
+      parentOuAjouter=self.parentQt
+      from .monWidgetBloc import MonWidgetBloc
+      while (parentOuAjouter and isinstance(parentOuAjouter, MonWidgetBloc)) :
+         parentOuAjouter=parentOuAjouter.parentQt
+      parentOuAjouter.ajoutMC(texteListeNom)
+
 
 class MonWidgetFact(Ui_WidgetFact,MonWidgetFactCommun):
   def __init__(self,node,editor,parentQt,definition, obj, niveau,commande,insertIn=1):

diff --git a/UiQT5/desWidgetFact.ui b/UiQT5/desWidgetFact.ui
index 2a9dbbec400c6465f9d51d36a2573a0d632031c0..cba4773d5dd7881c6703eb2cfd256e0c3a3567d6 100644 (file)
--- a/UiQT5/desWidgetFact.ui
+++ b/UiQT5/desWidgetFact.ui
@@ -37,16 +37,7 @@
    <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">
+   <property name="margin">
     <number>0</number>
    </property>
    <item>
@@ -388,6 +379,38 @@
            </property>
           </spacer>
          </item>
+         <item>
+          <widget class="QToolButton" name="RBPlus">
+           <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/PlusBleu.png</normaloff>../Editeur/icons/PlusBleu.png</iconset>
+           </property>
+           <property name="iconSize">
+            <size>
+             <width>21</width>
+             <height>25</height>
+            </size>
+           </property>
+          </widget>
+         </item>
          <item>
           <widget class="QToolButton" name="RBPoubelle">
            <property name="minimumSize">
@@ -455,9 +478,6 @@
   </layout>
   <zorder></zorder>
   <zorder></zorder>
-  <zorder></zorder>
-  <zorder>verticalSpacer_2</zorder>
-  <zorder></zorder>
  </widget>
  <customwidgets>
   <customwidget>