From b21cdd8b28ff1e84c833ca6a96636014f36aad72 Mon Sep 17 00:00:00 2001
From: Laurent Trinques <scorpio@qelectrotech.org>
Date: Wed, 1 Jul 2020 15:04:04 +0200
Subject: [PATCH] Try to fix conductorInfoKeys

---
 sources/editor/ui/dynamictextfieldeditor.cpp     |  2 +-
 sources/qetapp.cpp                               | 16 +++++++++++++---
 .../qetgraphicsitem/dynamicelementtextitem.cpp   |  4 ++--
 sources/ui/compositetexteditdialog.cpp           |  2 +-
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/sources/editor/ui/dynamictextfieldeditor.cpp b/sources/editor/ui/dynamictextfieldeditor.cpp
index 15f4216cc..44ac9363f 100644
--- a/sources/editor/ui/dynamictextfieldeditor.cpp
+++ b/sources/editor/ui/dynamictextfieldeditor.cpp
@@ -190,7 +190,7 @@ void DynamicTextFieldEditor::fillInfoComboBox()
 	QString type = elementEditor()->elementScene()->elementType();
 	
 	if(type.contains("report"))
-		strl << "function" << "tension-protocol";
+		strl << "function" << "tension-protocol" << "couleur-conducteur" << "section-conducteur";
 	else
 		strl = QETApp::elementInfoKeys();
 	
diff --git a/sources/qetapp.cpp b/sources/qetapp.cpp
index dfc1744a6..423189101 100644
--- a/sources/qetapp.cpp
+++ b/sources/qetapp.cpp
@@ -297,7 +297,9 @@ QStringList QETApp::elementInfoKeys()
 			  
 			  << "comment"
 			  << "function"
-			  << "tension_protocol"
+			  << "tension-protocol"
+			  << "couleur-conducteur"
+			  << "section-conducteur"
 			  << "auxiliary1"
 			  << "auxiliary2"
 			  
@@ -328,7 +330,9 @@ QString QETApp::elementTranslatedInfoKey(const QString &info)
 	
 	else if (info == "comment") return tr("Commentaire");
 	else if (info == "function") return tr("Fonction");
-	else if (info == "tension_protocol") return tr("Tension / Protocole");
+	else if (info == "tension-protocol") return tr("Tension / Protocole");
+	else if (info == "couleur-conducteur") return tr("couleur-conducteur");
+	else if (info == "section-conducteur") return tr("section-conducteur");
 	else if (info == "auxiliary1") return tr("Bloc auxiliaire 1");
 	else if (info == "auxiliary2") return tr("Bloc auxiliaire 2");
 	
@@ -368,7 +372,9 @@ QString QETApp::elementInfoToVar(const QString &info)
 	else if (info == "machine_manufacturer_reference") return QString("%{machine_manufacturer_reference}");
 	else if (info == "location")                       return QString("%{location}");
 	else if (info == "function")                       return QString("%{function}");
-	else if (info == "tension_protocol")               return QString("%{tension_protocol}");
+	else if (info == "tension-protocol")               return QString("%{tension-protocol}");
+	else if (info == "couleur-conducteur")             return QString("%{couleur-conducteur}");
+	else if (info == "section-conducteur")             return QString("%{section-conducteur}");
 	
 	return (QString ("%{void}"));
 }
@@ -384,6 +390,8 @@ QStringList QETApp::conductorInfoKeys()
 	keys.append("text");
 	keys.append("function");
 	keys.append("tension/protocol");
+	keys.append("couleur-conducteur");
+	keys.append("section-conducteur");
 	
 	return keys;
 }
@@ -400,6 +408,8 @@ QString QETApp::conductorTranslatedInfoKey(const QString &key)
 	else if (key == "text")              return tr("Texte");
 	else if (key == "function")          return tr("Fonction");
 	else if (key ==  "tension/protocol") return tr("Tension / Protocole");
+	else if (key ==  "couleur-conducteur") return tr("couleur-conducteur");
+	else if (key ==  "section-conducteur") return tr("section-conducteur");
 	return QString();
 }
 
diff --git a/sources/qetgraphicsitem/dynamicelementtextitem.cpp b/sources/qetgraphicsitem/dynamicelementtextitem.cpp
index cece1ed4b..739ad1555 100644
--- a/sources/qetgraphicsitem/dynamicelementtextitem.cpp
+++ b/sources/qetgraphicsitem/dynamicelementtextitem.cpp
@@ -1188,9 +1188,9 @@ QString DynamicElementTextItem::reportReplacedCompositeText() const
 				string.replace("%{function}", m_watched_conductor.data()->properties().m_function);
 			if(string.contains("%{tension-protocol}"))
 				string.replace("%{tension-protocol}", m_watched_conductor.data()->properties().m_tension_protocol);
-			if(string.contains("%{}couleur-conducteur"))
+			if(string.contains("%{couleur-conducteur"))
 				string.replace("%{couleur-conducteur}", m_watched_conductor.data()->properties().m_wire_color);
-			if(string.contains("%{}section-conducteur"))
+			if(string.contains("%{section-conducteur"))
 				string.replace("%{section-conducteur}", m_watched_conductor.data()->properties().m_wire_section);
 		}
 	}
diff --git a/sources/ui/compositetexteditdialog.cpp b/sources/ui/compositetexteditdialog.cpp
index 5f822f488..3f818424d 100644
--- a/sources/ui/compositetexteditdialog.cpp
+++ b/sources/ui/compositetexteditdialog.cpp
@@ -56,7 +56,7 @@ void CompositeTextEditDialog::setUpComboBox()
 	
 	if(m_text && (m_text->parentElement()->linkType() & Element::AllReport)) //Special treatment for text owned by a folio report
 	{
-		qstrl << "label" << "function" << "tension-protocol";
+		qstrl << "label" << "function" << "tension-protocol" << "couleur-conducteur" << "section-conducteur";
 	}
 	else
 	{
-- 
2.27.0