From 24df870700c7c4239dfdeae43f312633360c7b8b Mon Sep 17 00:00:00 2001 From: scorpio810 Date: Mon, 5 Sep 2016 16:49:16 +0000 Subject: [PATCH] Minor : Assign new variables %M and %LM to Conductor Autonum git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4689 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- sources/qetgraphicsitem/conductor.cpp | 2 ++ sources/ui/numparteditorw.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sources/qetgraphicsitem/conductor.cpp b/sources/qetgraphicsitem/conductor.cpp index 76a1ee102..4635c00ec 100644 --- a/sources/qetgraphicsitem/conductor.cpp +++ b/sources/qetgraphicsitem/conductor.cpp @@ -1298,6 +1298,8 @@ QString Conductor::assignVariables(QString label) { 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; } diff --git a/sources/ui/numparteditorw.cpp b/sources/ui/numparteditorw.cpp index da8a48d9f..d283e5ee3 100644 --- a/sources/ui/numparteditorw.cpp +++ b/sources/ui/numparteditorw.cpp @@ -86,7 +86,7 @@ void NumPartEditorW::setVisibleItems() { 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")