[qet] [4689] Minor : Assign new variables %M and %LM to Conductor Autonum

[subversion@xxxxxxxxxxxxx]

Revision: 4689
Author:   scorpio810
Date:     2016-09-05 18:49:16 +0200 (Mon, 05 Sep 2016)
Log Message:
-----------
Minor : Assign new variables %M and %LM to Conductor Autonum

Modified Paths:
--------------
    trunk/sources/qetgraphicsitem/conductor.cpp
    trunk/sources/ui/numparteditorw.cpp

Modified: trunk/sources/qetgraphicsitem/conductor.cpp
===================================================================
--- trunk/sources/qetgraphicsitem/conductor.cpp	2016-09-05 11:24:10 UTC (rev 4688)
+++ trunk/sources/qetgraphicsitem/conductor.cpp	2016-09-05 16:49:16 UTC (rev 4689)
@@ -1298,6 +1298,8 @@
 	label.replace("%F", diagram() -> border_and_titleblock.folio());
 	label.replace("%id", QString::number(diagram()->folioIndex()+1));
 	label.replace("%total", QString::number(diagram()->border_and_titleblock.folioTotal()));
+	label.replace("%M",  diagram() -> border_and_titleblock.machine());
+	label.replace("%LM",  diagram() -> border_and_titleblock.locmach());
 	label = assignSeq(label, this);
 	return label;
 }

Modified: trunk/sources/ui/numparteditorw.cpp
===================================================================
--- trunk/sources/ui/numparteditorw.cpp	2016-09-05 11:24:10 UTC (rev 4688)
+++ trunk/sources/ui/numparteditorw.cpp	2016-09-05 16:49:16 UTC (rev 4689)
@@ -86,7 +86,7 @@
 	else if (parentWidget()->parentWidget()->objectName()=="ConductorTab") {
 		items	<< tr("Chiffre 1") << tr("Chiffre 1 - Folio") << tr("Chiffre 01")
 				<< tr("Chiffre 01 - Folio") << tr("Chiffre 001") << tr("Chiffre 001 - Folio")
-				<< tr("Texte") << tr("N° folio") << tr("Folio");
+				<< tr("Texte") << tr("N° folio") << tr("Folio") << tr("Machine") << tr("Locmach");
 	}
 	else
 		items << tr("Chiffre 1") << tr("Chiffre 1 - Folio") << tr("Chiffre 01")