From 6480a7b12038eb804c0a0b3b64ee448bad4c6493 Mon Sep 17 00:00:00 2001
From: blacksun
 <blacksun@r5936  blacksun  2019-06-24 19:44:37 +0200 (lun. 24 juin 2019)>
Date: Tue, 6 Dec 2016 19:57:22 +0000
Subject: [PATCH] Forget file from previous commit

git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4800 bfdf4180-ca20-0410-9c96-a3a8aa849046
---
 sources/ui/conductorpropertieswidget.ui | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/sources/ui/conductorpropertieswidget.ui b/sources/ui/conductorpropertieswidget.ui
index be9e629d5..61332b7d8 100644
--- a/sources/ui/conductorpropertieswidget.ui
+++ b/sources/ui/conductorpropertieswidget.ui
@@ -45,7 +45,7 @@
               </property>
              </widget>
             </item>
-            <item row="2" column="2">
+            <item row="3" column="2">
              <widget class="QLineEdit" name="m_function_le">
               <property name="clearButtonEnabled">
                <bool>true</bool>
@@ -74,35 +74,35 @@
               </property>
              </widget>
             </item>
-            <item row="3" column="2">
+            <item row="4" column="2">
              <widget class="QLineEdit" name="m_tension_protocol_le">
               <property name="clearButtonEnabled">
                <bool>true</bool>
               </property>
              </widget>
             </item>
-            <item row="3" column="0">
+            <item row="4" column="0">
              <widget class="QLabel" name="label_9">
               <property name="text">
                <string>Tension / Protocole :</string>
               </property>
              </widget>
             </item>
-            <item row="1" column="0">
+            <item row="2" column="0">
              <widget class="QLabel" name="label">
               <property name="text">
                <string>Texte :</string>
               </property>
              </widget>
             </item>
-            <item row="2" column="0">
+            <item row="3" column="0">
              <widget class="QLabel" name="label_8">
               <property name="text">
                <string>Fonction :</string>
               </property>
              </widget>
             </item>
-            <item row="1" column="2">
+            <item row="2" column="2">
              <widget class="QLineEdit" name="m_text_le">
               <property name="toolTip">
                <string>Texte</string>
@@ -112,7 +112,7 @@
               </property>
              </widget>
             </item>
-            <item row="1" column="3">
+            <item row="2" column="3">
              <widget class="QCheckBox" name="m_show_text_cb">
               <property name="toolTip">
                <string>Texte visible</string>
@@ -125,6 +125,16 @@
               </property>
              </widget>
             </item>
+            <item row="1" column="0">
+             <widget class="QLabel" name="label_11">
+              <property name="text">
+               <string>Formule du texte :</string>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="2">
+             <widget class="QLineEdit" name="m_formula_le"/>
+            </item>
            </layout>
           </item>
           <item>