From 11c77e40997430a83eb26f8db56cb3ec17ce2218 Mon Sep 17 00:00:00 2001
From: Pascal de Bruijn <pmjdebruijn@pcode.nl>
Date: Mon, 3 Feb 2025 17:34:14 +0100
Subject: [PATCH] TechDraw: Export with default filename (#19033)

* TechDraw: Export with default filename

* TechDraw: templates consistent drawing_number/revision_index
---
 src/Mod/TechDraw/Gui/MDIViewPage.cpp          | 48 +++++++++++++------
 src/Mod/TechDraw/Gui/MDIViewPage.h            |  1 +
 .../A0_Landscape_ISO5457_minimal.svg          |  2 +-
 .../A1_Landscape_ISO5457_minimal.svg          |  2 +-
 .../A2_Landscape_ISO5457_minimal.svg          |  2 +-
 .../A3_Landscape_ISO5457_minimal.svg          |  2 +-
 .../TechDraw/Templates/A3_Landscape_TD.svg    |  2 +-
 .../A4_Landscape_ISO5457_minimal.svg          |  2 +-
 .../Templates/A4_Portrait_ISO5457_minimal.svg |  2 +-
 .../TechDraw/Templates/ANSIA_Landscape.svg    |  4 +-
 src/Mod/TechDraw/Templates/ANSIA_Portrait.svg |  4 +-
 src/Mod/TechDraw/Templates/ANSIB.svg          |  4 +-
 .../TechDraw/Templates/ANSIB_Landscape.svg    |  4 +-
 src/Mod/TechDraw/Templates/ANSIB_Portrait.svg |  4 +-
 .../TechDraw/Templates/ANSIC_Landscape.svg    |  2 +-
 .../TechDraw/Templates/Arch_A_Landscape.svg   |  2 +-
 .../TechDraw/Templates/Arch_A_Portrait.svg    |  2 +-
 .../TechDraw/Templates/Arch_B_Landscape.svg   |  2 +-
 .../TechDraw/Templates/Arch_B_Portrait.svg    |  2 +-
 .../TechDraw/Templates/Arch_C_Landscape.svg   |  2 +-
 .../TechDraw/Templates/Arch_C_Portrait.svg    |  2 +-
 .../TechDraw/Templates/Arch_D_Landscape.svg   |  2 +-
 .../TechDraw/Templates/Arch_D_Portrait.svg    |  2 +-
 .../TechDraw/Templates/Arch_E1_Landscape.svg  |  2 +-
 .../TechDraw/Templates/Arch_E1_Portrait.svg   |  2 +-
 .../TechDraw/Templates/Arch_E2_Landscape.svg  |  2 +-
 .../TechDraw/Templates/Arch_E2_Portrait.svg   |  2 +-
 .../TechDraw/Templates/Arch_E3_Landscape.svg  |  2 +-
 .../TechDraw/Templates/Arch_E3_Portrait.svg   |  2 +-
 .../TechDraw/Templates/Arch_E_Landscape.svg   |  2 +-
 .../TechDraw/Templates/Arch_E_Portrait.svg    |  2 +-
 .../ISO 5457/ISO7200_titleblock_1_minimal.svg |  2 +-
 .../ISO 5457/ISO7200_titleblock_2.svg         |  2 +-
 .../ISO 5457/ISO7200_titleblock_4.svg         |  2 +-
 .../ISO 5457/ISO7200_titleblock_5_maximal.svg |  2 +-
 .../TechDraw/Templates/USLetter_Landscape.svg |  4 +-
 .../ca/A1_Landscape_ISO5457_minimal.svg       |  2 +-
 .../ca/A2_Landscape_ISO5457_minimal.svg       |  2 +-
 38 files changed, 76 insertions(+), 57 deletions(-)

diff --git a/src/Mod/TechDraw/Gui/MDIViewPage.cpp b/src/Mod/TechDraw/Gui/MDIViewPage.cpp
index 4944e89635..4246b971bf 100644
--- a/src/Mod/TechDraw/Gui/MDIViewPage.cpp
+++ b/src/Mod/TechDraw/Gui/MDIViewPage.cpp
@@ -457,6 +457,22 @@ void MDIViewPage::viewAll()
     m_vpPage->getQGVPage()->fitInView(m_scene->itemsBoundingRect(), Qt::KeepAspectRatio);
 }
 
+QString MDIViewPage::defaultFileName()
+{
+    const std::string separator{"_"};
+
+    auto doc = getPage()->getDocument();
+    std::string docLabel{doc->Label.getValue()};
+    std::string pageLabel{getPage()->Label.getValue()};
+    auto pageTemplate = dynamic_cast<TechDraw::DrawTemplate*>(getPage()->Template.getValue());
+    auto textMap = pageTemplate->EditableTexts.getValues();
+    auto drawingNumber = textMap["drawing_number"];
+    auto revision = textMap["revision_index"];
+    auto defaultName = docLabel + separator + pageLabel + separator + drawingNumber + separator + revision;
+
+    return QString::fromStdString(defaultName);
+}
+
 void MDIViewPage::saveSVG(std::string filename)
 {
     auto vpp = getViewProviderPage();
@@ -474,7 +490,7 @@ void MDIViewPage::saveSVG()
     filter << QObject::tr("All Files (*.*)");
     QString fn =
         Gui::FileDialog::getSaveFileName(Gui::getMainWindow(), QObject::tr("Export page as SVG"),
-                                         QString(), filter.join(QLatin1String(";;")));
+                                         defaultFileName(), filter.join(QLatin1String(";;")));
     if (fn.isEmpty()) {
         return;
     }
@@ -490,15 +506,16 @@ void MDIViewPage::saveDXF(std::string filename)
 
 void MDIViewPage::saveDXF()
 {
-    QString defaultDir;
-    QString fileName = Gui::FileDialog::getSaveFileName(
-        Gui::getMainWindow(), QString::fromUtf8(QT_TR_NOOP("Save DXF file")), defaultDir,
-        QString::fromUtf8("DXF (*.dxf)"));
-    if (fileName.isEmpty()) {
+    QStringList filter;
+    filter << QStringLiteral("DXF (*.dxf)");
+    filter << QObject::tr("All Files (*.*)");
+    QString fn =
+        Gui::FileDialog::getSaveFileName(Gui::getMainWindow(), QObject::tr("Export page as DXF"),
+                                         defaultFileName(), filter.join(QLatin1String(";;")));
+    if (fn.isEmpty()) {
         return;
     }
-
-    std::string sFileName = fileName.toUtf8().constData();
+    std::string sFileName = fn.toUtf8().constData();
     saveDXF(sFileName);
 }
 
@@ -513,15 +530,16 @@ void MDIViewPage::savePDF(std::string filename)
 
 void MDIViewPage::savePDF()
 {
-    QString defaultDir;
-    QString fileName = Gui::FileDialog::getSaveFileName(
-        Gui::getMainWindow(), QString::fromUtf8(QT_TR_NOOP("Save PDF file")), defaultDir,
-        QString::fromUtf8("PDF (*.pdf)"));
-    if (fileName.isEmpty()) {
+    QStringList filter;
+    filter << QStringLiteral("PDF (*.pdf)");
+    filter << QObject::tr("All Files (*.*)");
+    QString fn =
+        Gui::FileDialog::getSaveFileName(Gui::getMainWindow(), QObject::tr("Export page as PDF"),
+                                         defaultFileName(), filter.join(QLatin1String(";;")));
+    if (fn.isEmpty()) {
         return;
     }
-
-    std::string sFileName = fileName.toUtf8().constData();
+    std::string sFileName = fn.toUtf8().constData();
     savePDF(sFileName);
 }
 
diff --git a/src/Mod/TechDraw/Gui/MDIViewPage.h b/src/Mod/TechDraw/Gui/MDIViewPage.h
index 404347d12c..6843703d4f 100644
--- a/src/Mod/TechDraw/Gui/MDIViewPage.h
+++ b/src/Mod/TechDraw/Gui/MDIViewPage.h
@@ -157,6 +157,7 @@ private:
 
     QList<QGraphicsItem*> m_orderedSceneSelection;        //items in selection order
 
+    QString defaultFileName();
 };
 
 class MDIViewPagePy : public Py::PythonExtension<MDIViewPagePy>
diff --git a/src/Mod/TechDraw/Templates/A0_Landscape_ISO5457_minimal.svg b/src/Mod/TechDraw/Templates/A0_Landscape_ISO5457_minimal.svg
index 7a82383fd7..1765f2e267 100644
--- a/src/Mod/TechDraw/Templates/A0_Landscape_ISO5457_minimal.svg
+++ b/src/Mod/TechDraw/Templates/A0_Landscape_ISO5457_minimal.svg
@@ -237,7 +237,7 @@
     <text id="legal_owner_2_data_field" x="1159" y="808.1" freecad:editable="legal_owner_2" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
     <text id="legal_owner_3_data_field" x="1159" y="812.1" freecad:editable="legal_owner_3" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
     <text id="legal_owner_4_data_field" x="1159" y="816.1" freecad:editable="legal_owner_4" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
-    <text id="identification_number_data_field" x="1000" y="828.2" freecad:editable="identification_number"><tspan>DN</tspan></text>
+    <text id="identification_number_data_field" x="1000" y="828.2" freecad:editable="drawing_number"><tspan>DN</tspan></text>
     <text id="revision_index_data_field" x="1149" y="828.2" freecad:editable="revision_index" style="text-align:center;text-anchor:middle"><tspan>AAA</tspan></text>
     <text id="date_of_issue_data_field" x="1100" y="828.2" freecad:editable="date_of_issue" freecad:autofill="date"><tspan>YYYY-MM-DD</tspan></text>
     <text id="sheet_number_data_field" x="1169" y="828.2" freecad:editable="sheet_number" freecad:autofill="sheet" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
diff --git a/src/Mod/TechDraw/Templates/A1_Landscape_ISO5457_minimal.svg b/src/Mod/TechDraw/Templates/A1_Landscape_ISO5457_minimal.svg
index 66f0ca4c3e..3375b0712d 100644
--- a/src/Mod/TechDraw/Templates/A1_Landscape_ISO5457_minimal.svg
+++ b/src/Mod/TechDraw/Templates/A1_Landscape_ISO5457_minimal.svg
@@ -190,7 +190,7 @@
     <text id="legal_owner_2_data_field" x="811" y="561.1" freecad:editable="legal_owner_2" style="font-size:3.5px;text-align:center;text-anchor:middle"> <tspan/></text>
     <text id="legal_owner_3_data_field" x="811" y="565.1" freecad:editable="legal_owner_3" style="font-size:3.5px;text-align:center;text-anchor:middle"> <tspan/></text>
     <text id="legal_owner_4_data_field" x="811" y="569.1" freecad:editable="legal_owner_4" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
-    <text id="identification_number_data_field" x="652" y="581.2" freecad:editable="identification_number"><tspan>DN</tspan></text>
+    <text id="identification_number_data_field" x="652" y="581.2" freecad:editable="drawing_number"><tspan>DN</tspan></text>
     <text id="revision_index_data_field" x="801" y="581.2" freecad:editable="revision_index" style="text-align:center;text-anchor:middle"><tspan>AAA</tspan></text>
     <text id="date_of_issue_data_field" x="752" y="581.2" freecad:editable="date_of_issue" freecad:autofill="date"><tspan>YYYY-MM-DD</tspan></text>
     <text id="sheet_number_data_field" x="821" y="581.2" freecad:editable="sheet_number" freecad:autofill="sheet" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
diff --git a/src/Mod/TechDraw/Templates/A2_Landscape_ISO5457_minimal.svg b/src/Mod/TechDraw/Templates/A2_Landscape_ISO5457_minimal.svg
index 04bc82b06e..2f9f994195 100644
--- a/src/Mod/TechDraw/Templates/A2_Landscape_ISO5457_minimal.svg
+++ b/src/Mod/TechDraw/Templates/A2_Landscape_ISO5457_minimal.svg
@@ -157,7 +157,7 @@
     <text id="legal_owner_2_data_field" x="564" y="387.1" freecad:editable="legal_owner_2" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
     <text id="legal_owner_3_data_field" x="564" y="391.1" freecad:editable="legal_owner_3" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
     <text id="legal_owner_4_data_field" x="564" y="395.1" freecad:editable="legal_owner_4" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
-    <text id="identification_number_data_field" x="405" y="407.2" freecad:editable="identification_number"><tspan>DN</tspan></text>
+    <text id="identification_number_data_field" x="405" y="407.2" freecad:editable="drawing_number"><tspan>DN</tspan></text>
     <text id="revision_index_data_field" x="554" y="407.2" freecad:editable="revision_index" style="text-align:center;text-anchor:middle"><tspan>AAA</tspan></text>
     <text id="date_of_issue_data_field" x="505" y="407.2" freecad:editable="date_of_issue" freecad:autofill="date"><tspan>YYYY-MM-DD</tspan></text>
     <text id="sheet_number_data_field" x="574" y="407.2" freecad:editable="sheet_number" freecad:autofill="sheet" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
diff --git a/src/Mod/TechDraw/Templates/A3_Landscape_ISO5457_minimal.svg b/src/Mod/TechDraw/Templates/A3_Landscape_ISO5457_minimal.svg
index f6b95768f5..0dfff42a26 100644
--- a/src/Mod/TechDraw/Templates/A3_Landscape_ISO5457_minimal.svg
+++ b/src/Mod/TechDraw/Templates/A3_Landscape_ISO5457_minimal.svg
@@ -133,7 +133,7 @@
     <text id="legal_owner_2_data_field" x="390" y="264.1" freecad:editable="legal_owner_2" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
     <text id="legal_owner_3_data_field" x="390" y="268.1" freecad:editable="legal_owner_3" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
     <text id="legal_owner_4_data_field" x="390" y="272.1" freecad:editable="legal_owner_4" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
-    <text id="identification_number_data_field" x="231" y="284.2" freecad:editable="identification_number"><tspan>DN</tspan></text>
+    <text id="identification_number_data_field" x="231" y="284.2" freecad:editable="drawing_number"><tspan>DN</tspan></text>
     <text id="revision_index_data_field" x="380" y="284.2" freecad:editable="revision_index" style="text-align:center;text-anchor:middle"><tspan>AAA</tspan></text>
     <text id="date_of_issue_data_field" x="331" y="284.2" freecad:editable="date_of_issue" freecad:autofill="date"><tspan>YYYY-MM-DD</tspan></text>
     <text id="sheet_number_data_field" x="400" y="284.2" freecad:editable="sheet_number" freecad:autofill="sheet" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
diff --git a/src/Mod/TechDraw/Templates/A3_Landscape_TD.svg b/src/Mod/TechDraw/Templates/A3_Landscape_TD.svg
index cf981c1026..28d639ad68 100644
--- a/src/Mod/TechDraw/Templates/A3_Landscape_TD.svg
+++ b/src/Mod/TechDraw/Templates/A3_Landscape_TD.svg
@@ -901,7 +901,7 @@
        x="266.50964"
        y="278.57715"
        style="line-height:0%"
-       freecad:editable="DrawingNumber"><tspan
+       freecad:editable="drawing_number"><tspan
          id="tspan205">NUMBER</tspan></text>
     <text
        id="tspan3333-6-6-3-8-7"
diff --git a/src/Mod/TechDraw/Templates/A4_Landscape_ISO5457_minimal.svg b/src/Mod/TechDraw/Templates/A4_Landscape_ISO5457_minimal.svg
index 5324d213be..5556fc330f 100644
--- a/src/Mod/TechDraw/Templates/A4_Landscape_ISO5457_minimal.svg
+++ b/src/Mod/TechDraw/Templates/A4_Landscape_ISO5457_minimal.svg
@@ -108,7 +108,7 @@
     <text id="legal_owner_2_data_field" x="267" y="177.1" freecad:editable="legal_owner_2" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
     <text id="legal_owner_3_data_field" x="267" y="181.1" freecad:editable="legal_owner_3" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
     <text id="legal_owner_4_data_field" x="267" y="185.1" freecad:editable="legal_owner_4" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
-    <text id="identification_number_data_field" x="108" y="197.2" freecad:editable="identification_number"><tspan>DN</tspan></text>
+    <text id="identification_number_data_field" x="108" y="197.2" freecad:editable="drawing_number"><tspan>DN</tspan></text>
     <text id="revision_index_data_field" x="257" y="197.2" freecad:editable="revision_index" style="text-align:center;text-anchor:middle"><tspan>AAA</tspan></text>
     <text id="date_of_issue_data_field" x="208" y="197.2" freecad:editable="date_of_issue" freecad:autofill="date"><tspan>YYYY-MM-DD</tspan></text>
     <text id="sheet_number_data_field" x="277" y="197.2" freecad:editable="sheet_number" freecad:autofill="sheet" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
diff --git a/src/Mod/TechDraw/Templates/A4_Portrait_ISO5457_minimal.svg b/src/Mod/TechDraw/Templates/A4_Portrait_ISO5457_minimal.svg
index 617dc8a078..91c3486856 100644
--- a/src/Mod/TechDraw/Templates/A4_Portrait_ISO5457_minimal.svg
+++ b/src/Mod/TechDraw/Templates/A4_Portrait_ISO5457_minimal.svg
@@ -108,7 +108,7 @@
     <text id="legal_owner_2_data_field" x="180" y="264.1" freecad:editable="legal_owner_2" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
     <text id="legal_owner_3_data_field" x="180" y="268.1" freecad:editable="legal_owner_3" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
     <text id="legal_owner_4_data_field" x="180" y="272.1" freecad:editable="legal_owner_4" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan/></text>
-    <text id="identification_number_data_field" x="21" y="284.2" freecad:editable="identification_number"><tspan>DN</tspan></text>
+    <text id="identification_number_data_field" x="21" y="284.2" freecad:editable="drawing_number"><tspan>DN</tspan></text>
     <text id="revision_index_data_field" x="170" y="284.2" freecad:editable="revision_index" style="text-align:center;text-anchor:middle"><tspan>AAA</tspan></text>
     <text id="date_of_issue_data_field" x="121" y="284.2" freecad:editable="date_of_issue" freecad:autofill="date"><tspan>YYYY-MM-DD</tspan></text>
     <text id="sheet_number_data_field" x="190" y="284.2" freecad:editable="sheet_number" freecad:autofill="sheet" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
diff --git a/src/Mod/TechDraw/Templates/ANSIA_Landscape.svg b/src/Mod/TechDraw/Templates/ANSIA_Landscape.svg
index c9eba5a968..5f2d7f9f61 100644
--- a/src/Mod/TechDraw/Templates/ANSIA_Landscape.svg
+++ b/src/Mod/TechDraw/Templates/ANSIA_Landscape.svg
@@ -52,8 +52,8 @@
  <text id="BlockB Title1" x="163.88148" y="171.13162" fill="#000000" font-family="sans-serif" font-size="5.2425px" letter-spacing="0px" word-spacing="0px" style="line-height:0%" freecad:editable="DrawingTitle1"><tspan id="tspan4467" font-family="sans-serif">Drawing Title 1</tspan></text>
  <text id="BlockBTitle2" x="164.08731" y="176.80217" fill="#000000" font-family="sans" letter-spacing="0px" word-spacing="0px" style="line-height:0%" freecad:editable="DrawingTitle2"><tspan id="tspan3762-4" x="164.08731" y="176.80217" font-size="3.1455px" style="line-height:1.25">Drawing Title 2</tspan></text>
  <text id="BlockB Title3" x="164.08731" y="182.7054" fill="#000000" font-family="sans" letter-spacing="0px" word-spacing="0px" style="line-height:0%" freecad:editable="DrawingTitle3"><tspan id="tspan3766-5" x="164.08731" y="182.7054" font-size="3.1455px" style="line-height:1.25">Drawing Title 3</tspan></text>
- <text id="BlockC DrawingNumber" x="198.43159" y="193.43471" color="#000000" fill="#000000" font-family="sans-serif" letter-spacing="0px" stroke-width="1px" word-spacing="0px" style="line-height:0%;text-decoration-line:none;text-indent:0;text-transform:none" freecad:editable="DrawingNumber"><tspan id="tspan3792-9" x="198.43159" y="193.43471" font-family="sans-serif" font-size="4.194px" style="line-height:1.25">Drawing Number</tspan></text>
- <text id="BlockD Revision" x="252.18163" y="193.06583" color="#000000" fill="#000000" font-family="sans-serif" letter-spacing="0px" stroke-width="1px" word-spacing="0px" style="line-height:0%;text-decoration-line:none;text-indent:0;text-transform:none" freecad:editable="Revision"><tspan id="tspan3796-0" x="252.18163" y="193.06583" font-family="sans-serif" font-size="3.1455px" style="line-height:1.25">Rev</tspan></text>
+ <text id="BlockC DrawingNumber" x="198.43159" y="193.43471" color="#000000" fill="#000000" font-family="sans-serif" letter-spacing="0px" stroke-width="1px" word-spacing="0px" style="line-height:0%;text-decoration-line:none;text-indent:0;text-transform:none" freecad:editable="drawing_number"><tspan id="tspan3792-9" x="198.43159" y="193.43471" font-family="sans-serif" font-size="4.194px" style="line-height:1.25">Drawing Number</tspan></text>
+ <text id="BlockD Revision" x="252.18163" y="193.06583" color="#000000" fill="#000000" font-family="sans-serif" letter-spacing="0px" stroke-width="1px" word-spacing="0px" style="line-height:0%;text-decoration-line:none;text-indent:0;text-transform:none" freecad:editable="revision_index"><tspan id="tspan3796-0" x="252.18163" y="193.06583" font-family="sans-serif" font-size="3.1455px" style="line-height:1.25">Rev</tspan></text>
  <text id="BlockE DrawnBy" x="134.63594" y="184.10947" color="#000000" fill="#000000" fill-rule="evenodd" font-family="sans-serif" stroke-dashoffset="2" stroke-linecap="round" stroke-linejoin="round" style="line-height:0%" freecad:editable="DrawnBy"><tspan id="tspan6969" x="134.63594" y="184.10947" font-family="sans" font-size="2.9489px" style="line-height:1.25">Drawn By</tspan></text>
  <text id="BlockE CheckedBy" x="134.75978" y="189.3239" color="#000000" fill="#000000" fill-rule="evenodd" font-family="sans" style="line-height:0%" freecad:editable="CheckedBy"><tspan id="tspan6973" x="134.75978" y="189.3239" font-size="2.9489px" style="line-height:1.25">Checked By</tspan></text>
  <text id="BlockE Approved1" x="134.90233" y="194.49297" color="#000000" fill="#000000" fill-rule="evenodd" font-family="sans" style="line-height:0%" freecad:editable="Approved1"><tspan id="tspan6977" x="134.90233" y="194.49297" font-size="2.9489px" style="line-height:1.25">Approved 1</tspan></text>
diff --git a/src/Mod/TechDraw/Templates/ANSIA_Portrait.svg b/src/Mod/TechDraw/Templates/ANSIA_Portrait.svg
index 6147891942..729b023d5b 100644
--- a/src/Mod/TechDraw/Templates/ANSIA_Portrait.svg
+++ b/src/Mod/TechDraw/Templates/ANSIA_Portrait.svg
@@ -40,8 +40,8 @@
  <text id="BlockB Title1" x="104.54329" y="232.29462" fill="#000000" font-family="sans-serif" font-size="5.2425px" letter-spacing="0px" word-spacing="0px" style="line-height:0%" freecad:editable="DrawingTitle1"><tspan id="tspan4467" font-family="sans-serif">Drawing Title 1</tspan></text>
  <text id="BlockBTitle2" x="104.74911" y="237.96518" fill="#000000" font-family="sans" font-size="12px" letter-spacing="0px" word-spacing="0px" style="line-height:0%" freecad:editable="DrawingTitle2"><tspan id="tspan3762-4" x="104.74911" y="237.96518" font-size="3.1455px" style="line-height:1.25">Drawing Title 2</tspan></text>
  <text id="BlockB Title3" x="104.74911" y="243.86841" fill="#000000" font-family="sans" font-size="12px" letter-spacing="0px" word-spacing="0px" style="line-height:0%" freecad:editable="DrawingTitle3"><tspan id="tspan3766-5" x="104.74911" y="243.86841" font-size="3.1455px" style="line-height:1.25">Drawing Title 3</tspan></text>
- <text id="BlockC DrawingNumber" x="139.0934" y="254.59772" color="#000000" fill="#000000" font-family="sans-serif" font-size="12px" letter-spacing="0px" stroke-width="1px" word-spacing="0px" style="line-height:0%;text-decoration-line:none;text-indent:0;text-transform:none" freecad:editable="DrawingNumber"><tspan id="tspan3792-9" x="139.0934" y="254.59772" font-family="sans-serif" font-size="4.194px" stroke-width="1px" style="line-height:1.25">Drawing Number</tspan></text>
- <text id="BlockD Revision" x="192.84343" y="254.22882" color="#000000" fill="#000000" font-family="sans-serif" font-size="12px" letter-spacing="0px" stroke-width="1px" word-spacing="0px" style="line-height:0%;text-decoration-line:none;text-indent:0;text-transform:none" freecad:editable="Revision"><tspan id="tspan3796-0" x="192.84343" y="254.22882" font-family="sans-serif" font-size="3.1455px" stroke-width="1px" style="line-height:1.25">Rev</tspan></text>
+ <text id="BlockC DrawingNumber" x="139.0934" y="254.59772" color="#000000" fill="#000000" font-family="sans-serif" font-size="12px" letter-spacing="0px" stroke-width="1px" word-spacing="0px" style="line-height:0%;text-decoration-line:none;text-indent:0;text-transform:none" freecad:editable="drawing_number"><tspan id="tspan3792-9" x="139.0934" y="254.59772" font-family="sans-serif" font-size="4.194px" stroke-width="1px" style="line-height:1.25">Drawing Number</tspan></text>
+ <text id="BlockD Revision" x="192.84343" y="254.22882" color="#000000" fill="#000000" font-family="sans-serif" font-size="12px" letter-spacing="0px" stroke-width="1px" word-spacing="0px" style="line-height:0%;text-decoration-line:none;text-indent:0;text-transform:none" freecad:editable="revision_index"><tspan id="tspan3796-0" x="192.84343" y="254.22882" font-family="sans-serif" font-size="3.1455px" stroke-width="1px" style="line-height:1.25">Rev</tspan></text>
  <text id="BlockE DrawnBy" x="75.297729" y="245.27246" color="#000000" fill="#000000" fill-rule="evenodd" font-family="sans-serif" font-size="12px" stroke-dashoffset="2" stroke-linecap="round" stroke-linejoin="round" style="line-height:0%" freecad:editable="DrawnBy"><tspan id="tspan6969" x="75.297729" y="245.27246" font-family="sans" font-size="2.9489px" style="line-height:1.25">Drawn By</tspan></text>
  <text id="BlockE CheckedBy" x="75.42157" y="250.48691" color="#000000" fill="#000000" fill-rule="evenodd" font-family="sans" font-size="12px" style="line-height:0%" freecad:editable="CheckedBy"><tspan id="tspan6973" x="75.42157" y="250.48691" font-size="2.9489px" style="line-height:1.25">Checked By</tspan></text>
  <text id="BlockE Approved1" x="75.56411" y="255.65598" color="#000000" fill="#000000" fill-rule="evenodd" font-family="sans" font-size="12px" style="line-height:0%" freecad:editable="Approved1"><tspan id="tspan6977" x="75.56411" y="255.65598" font-size="2.9489px" style="line-height:1.25">Approved 1</tspan></text>
diff --git a/src/Mod/TechDraw/Templates/ANSIB.svg b/src/Mod/TechDraw/Templates/ANSIB.svg
index 82190e68e5..0c1ec5dd12 100644
--- a/src/Mod/TechDraw/Templates/ANSIB.svg
+++ b/src/Mod/TechDraw/Templates/ANSIB.svg
@@ -605,7 +605,7 @@
        stroke-width="1px"
        word-spacing="0px"
        style="line-height:0%;text-decoration-line:none;text-indent:0;text-transform:none"
-       freecad:editable="DrawingNumber"><tspan
+       freecad:editable="drawing_number"><tspan
          id="tspan3792-9"
          x="350.77899"
          y="251.48938">Drawing Number</tspan></text>
@@ -620,7 +620,7 @@
        stroke-width="1px"
        word-spacing="0px"
        style="line-height:0%;text-decoration-line:none;text-indent:0;text-transform:none"
-       freecad:editable="Revision"><tspan
+       freecad:editable="revision_index"><tspan
          id="tspan3796-0"
          x="404.52902"
          y="251.12048">Rev</tspan></text>
diff --git a/src/Mod/TechDraw/Templates/ANSIB_Landscape.svg b/src/Mod/TechDraw/Templates/ANSIB_Landscape.svg
index 979fdfb462..7e07608f5f 100644
--- a/src/Mod/TechDraw/Templates/ANSIB_Landscape.svg
+++ b/src/Mod/TechDraw/Templates/ANSIB_Landscape.svg
@@ -548,7 +548,7 @@
      stroke-width="1px"
      word-spacing="0px"
      style="line-height:0%;text-decoration-line:none;text-indent:0;text-transform:none"
-     freecad:editable="DrawingNumber"><tspan
+     freecad:editable="drawing_number"><tspan
        id="tspan3792-9"
        x="350.77899"
        y="251.48938">Drawing Number</tspan></text>
@@ -564,7 +564,7 @@
      stroke-width="1px"
      word-spacing="0px"
      style="line-height:0%;text-decoration-line:none;text-indent:0;text-transform:none"
-     freecad:editable="Revision"><tspan
+     freecad:editable="revision_index"><tspan
        id="tspan3796-0"
        x="404.52902"
        y="251.12048">Rev</tspan></text>
diff --git a/src/Mod/TechDraw/Templates/ANSIB_Portrait.svg b/src/Mod/TechDraw/Templates/ANSIB_Portrait.svg
index b37751f001..4d12b5bac6 100644
--- a/src/Mod/TechDraw/Templates/ANSIB_Portrait.svg
+++ b/src/Mod/TechDraw/Templates/ANSIB_Portrait.svg
@@ -398,7 +398,7 @@
      stroke-width="1px"
      word-spacing="0px"
      style="line-height:0%;text-decoration-line:none;text-indent:0;text-transform:none"
-     freecad:editable="DrawingNumber"><tspan
+     freecad:editable="drawing_number"><tspan
        id="tspan3792-9"
        x="199.7832"
        y="405.91364">Drawing Number</tspan></text>
@@ -414,7 +414,7 @@
      stroke-width="1px"
      word-spacing="0px"
      style="line-height:0%;text-decoration-line:none;text-indent:0;text-transform:none"
-     freecad:editable="Revision"><tspan
+     freecad:editable="revision_index"><tspan
        id="tspan3796-0"
        x="253.53323"
        y="405.54474">Rev</tspan></text>
diff --git a/src/Mod/TechDraw/Templates/ANSIC_Landscape.svg b/src/Mod/TechDraw/Templates/ANSIC_Landscape.svg
index cfd64e69f3..784dd7a7e3 100644
--- a/src/Mod/TechDraw/Templates/ANSIC_Landscape.svg
+++ b/src/Mod/TechDraw/Templates/ANSIC_Landscape.svg
@@ -321,7 +321,7 @@
  <text id="text3331-5-9-1" x="399.95898" y="399.68958" fill="#000000" font-family="Arial" font-size="9.8636px" letter-spacing="0px" stroke-width=".10686" text-align="center" text-anchor="middle" word-spacing="0px" style="line-height:0%" freecad:editable="A3"><tspan id="tspan3316" x="399.95898" y="399.68958" font-size="4.1756px" stroke-width=".10686" style="line-height:1.25">ANSI C</tspan></text>
  <text id="text3331-5-9" x="399.75266" y="410.16138" fill="#000000" font-family="sans" font-size="9.8636px" letter-spacing="0px" stroke-width=".10686" text-align="center" text-anchor="middle" word-spacing="0px" style="line-height:0%" freecad:editable="scale" freecad:autofill="scale"><tspan id="tspan3333-6-6" x="399.75266" y="410.16138" font-size="3.2879px" stroke-width=".10686" style="line-height:1.25">SCALE</tspan></text>
  <text id="text3331-5-9-4" x="418.39166" y="410.16138" fill="#000000" font-family="sans" font-size="9.8636px" letter-spacing="0px" stroke-width=".10686" text-align="center" text-anchor="middle" word-spacing="0px" style="line-height:0%" freecad:editable="Weight"><tspan id="tspan3333-6-6-3" x="418.39166" y="410.16138" font-size="3.2879px" stroke-width=".10686" style="line-height:1.25">WEIGHT</tspan></text>
- <text id="text3331-5-9-4-3" x="430.0199" y="410.16138" fill="#000000" font-family="sans" font-size="9.8636px" letter-spacing="0px" stroke-width=".10686" word-spacing="0px" style="line-height:0%" freecad:editable="DrawingNumber"><tspan id="tspan3333-6-6-3-8" x="430.0199" y="410.16138" font-size="3.2879px" stroke-width=".10686" style="line-height:1.25">NUMBER</tspan></text>
+ <text id="text3331-5-9-4-3" x="430.0199" y="410.16138" fill="#000000" font-family="sans" font-size="9.8636px" letter-spacing="0px" stroke-width=".10686" word-spacing="0px" style="line-height:0%" freecad:editable="drawing_number"><tspan id="tspan3333-6-6-3-8" x="430.0199" y="410.16138" font-size="3.2879px" stroke-width=".10686" style="line-height:1.25">NUMBER</tspan></text>
  <text id="text3331-5-9-4-3-9" x="516.71234" y="410.16138" fill="#000000" font-family="sans" font-size="9.8636px" letter-spacing="0px" stroke-width=".10686" text-align="center" text-anchor="middle" word-spacing="0px" style="line-height:0%" freecad:editable="SheetNumber" freecad:autofill="sheet"><tspan id="tspan3333-6-6-3-8-7" x="516.71234" y="410.16138" font-size="3.2879px" stroke-width=".10686" style="line-height:1.25">SHEET</tspan></text>
  <text id="text3331-0" x="467.7522" y="373.39777" fill="#000000" font-family="Arial" font-size="9.8636px" font-weight="bold" letter-spacing="0px" stroke-width=".10686" text-align="center" text-anchor="middle" word-spacing="0px" style="line-height:0%" freecad:editable="Title" freecad:autofill="title"><tspan id="tspan3333-5" x="467.7522" y="373.39777" font-family="Arial" font-size="6.9593px" font-weight="bold" stroke-width=".10686" text-align="center" text-anchor="middle" style="line-height:125%">TITLE</tspan></text>
  <text id="text3331-0-4" x="467.74326" y="381.90521" fill="#000000" font-family="Arial" font-size="9.8636px" letter-spacing="0px" stroke-width=".10686" text-align="center" text-anchor="middle" word-spacing="0px" style="line-height:0%" freecad:editable="Subtitle"><tspan id="tspan3333-5-6" x="467.74326" y="381.90521" font-size="4.6396px" stroke-width=".10686" style="line-height:1.25">SUBTITLE</tspan></text>
diff --git a/src/Mod/TechDraw/Templates/Arch_A_Landscape.svg b/src/Mod/TechDraw/Templates/Arch_A_Landscape.svg
index 1704829275..3d726e2f8b 100644
--- a/src/Mod/TechDraw/Templates/Arch_A_Landscape.svg
+++ b/src/Mod/TechDraw/Templates/Arch_A_Landscape.svg
@@ -1239,7 +1239,7 @@
      stroke-width=".054953"
      word-spacing="0px"
      style="line-height:125%"
-     freecad:editable="DrawingNumber"><tspan
+     freecad:editable="drawing_number"><tspan
        id="tspan3333-6-6-3-8-4"
        x="180.55609"
        y="213.89391"
diff --git a/src/Mod/TechDraw/Templates/Arch_A_Portrait.svg b/src/Mod/TechDraw/Templates/Arch_A_Portrait.svg
index 6ca85554ef..f6f568ec24 100644
--- a/src/Mod/TechDraw/Templates/Arch_A_Portrait.svg
+++ b/src/Mod/TechDraw/Templates/Arch_A_Portrait.svg
@@ -1239,7 +1239,7 @@
      stroke-width=".054953"
      word-spacing="0px"
      style="line-height:125%"
-     freecad:editable="DrawingNumber"><tspan
+     freecad:editable="drawing_number"><tspan
        id="tspan3333-6-6-3-8-0"
        x="106.00134"
        y="292.43094"
diff --git a/src/Mod/TechDraw/Templates/Arch_B_Landscape.svg b/src/Mod/TechDraw/Templates/Arch_B_Landscape.svg
index 3165ecb455..45380391e5 100644
--- a/src/Mod/TechDraw/Templates/Arch_B_Landscape.svg
+++ b/src/Mod/TechDraw/Templates/Arch_B_Landscape.svg
@@ -1239,7 +1239,7 @@
      stroke-width=".054953"
      word-spacing="0px"
      style="line-height:125%"
-     freecad:editable="DrawingNumber"><tspan
+     freecad:editable="drawing_number"><tspan
        id="tspan3333-6-6-3-8-3"
        x="329.32751"
        y="287.52826"
diff --git a/src/Mod/TechDraw/Templates/Arch_B_Portrait.svg b/src/Mod/TechDraw/Templates/Arch_B_Portrait.svg
index fa75249d6b..f7adff3946 100644
--- a/src/Mod/TechDraw/Templates/Arch_B_Portrait.svg
+++ b/src/Mod/TechDraw/Templates/Arch_B_Portrait.svg
@@ -1239,7 +1239,7 @@
      stroke-width=".054953"
      word-spacing="0px"
      style="line-height:125%"
-     freecad:editable="DrawingNumber"><tspan
+     freecad:editable="drawing_number"><tspan
        id="tspan3333-6-6-3-8-8"
        x="180.3307"
        y="442.151"
diff --git a/src/Mod/TechDraw/Templates/Arch_C_Landscape.svg b/src/Mod/TechDraw/Templates/Arch_C_Landscape.svg
index 3039ba3c51..adae6d4e72 100644
--- a/src/Mod/TechDraw/Templates/Arch_C_Landscape.svg
+++ b/src/Mod/TechDraw/Templates/Arch_C_Landscape.svg
@@ -1239,7 +1239,7 @@
      stroke-width=".054953"
      word-spacing="0px"
      style="line-height:125%"
-     freecad:editable="DrawingNumber"><tspan
+     freecad:editable="drawing_number"><tspan
        id="tspan3333-6-6-3-8-6"
        x="478.09897"
        y="434.79694"
diff --git a/src/Mod/TechDraw/Templates/Arch_C_Portrait.svg b/src/Mod/TechDraw/Templates/Arch_C_Portrait.svg
index f88ab89964..b6b890ad6d 100644
--- a/src/Mod/TechDraw/Templates/Arch_C_Portrait.svg
+++ b/src/Mod/TechDraw/Templates/Arch_C_Portrait.svg
@@ -1239,7 +1239,7 @@
      stroke-width=".07327"
      word-spacing="0px"
      style="line-height:125%"
-     freecad:editable="DrawingNumber"><tspan
+     freecad:editable="drawing_number"><tspan
        id="tspan3333-6-6-3-8-3"
        x="328.9895"
        y="591.87079"
diff --git a/src/Mod/TechDraw/Templates/Arch_D_Landscape.svg b/src/Mod/TechDraw/Templates/Arch_D_Landscape.svg
index 23b4ad9098..3bda1d8e04 100644
--- a/src/Mod/TechDraw/Templates/Arch_D_Landscape.svg
+++ b/src/Mod/TechDraw/Templates/Arch_D_Landscape.svg
@@ -1239,7 +1239,7 @@
      stroke-width=".054953"
      word-spacing="0px"
      style="line-height:125%"
-     freecad:editable="DrawingNumber"><tspan
+     freecad:editable="drawing_number"><tspan
        id="tspan3333-6-6-3-8-5"
        x="775.64185"
        y="582.06567"
diff --git a/src/Mod/TechDraw/Templates/Arch_D_Portrait.svg b/src/Mod/TechDraw/Templates/Arch_D_Portrait.svg
index 5359f3c0b8..585005e040 100644
--- a/src/Mod/TechDraw/Templates/Arch_D_Portrait.svg
+++ b/src/Mod/TechDraw/Templates/Arch_D_Portrait.svg
@@ -1239,7 +1239,7 @@
      stroke-width=".054953"
      word-spacing="0px"
      style="line-height:125%"
-     freecad:editable="DrawingNumber"><tspan
+     freecad:editable="drawing_number"><tspan
        id="tspan3333-6-6-3-8-4"
        x="477.64819"
        y="891.31104"
diff --git a/src/Mod/TechDraw/Templates/Arch_E1_Landscape.svg b/src/Mod/TechDraw/Templates/Arch_E1_Landscape.svg
index dcb58e0a1c..d496cc4587 100644
--- a/src/Mod/TechDraw/Templates/Arch_E1_Landscape.svg
+++ b/src/Mod/TechDraw/Templates/Arch_E1_Landscape.svg
@@ -1239,7 +1239,7 @@
      stroke-width=".054953"
      word-spacing="0px"
      style="line-height:125%"
-     freecad:editable="DrawingNumber"><tspan
+     freecad:editable="drawing_number"><tspan
        id="tspan3333-6-6-3-8-0"
        x="924.41321"
        y="729.33435"
diff --git a/src/Mod/TechDraw/Templates/Arch_E1_Portrait.svg b/src/Mod/TechDraw/Templates/Arch_E1_Portrait.svg
index 18fbfacd9a..66e88bdd24 100644
--- a/src/Mod/TechDraw/Templates/Arch_E1_Portrait.svg
+++ b/src/Mod/TechDraw/Templates/Arch_E1_Portrait.svg
@@ -1239,7 +1239,7 @@
      stroke-width=".054953"
      word-spacing="0px"
      style="line-height:125%"
-     freecad:editable="DrawingNumber"><tspan
+     freecad:editable="drawing_number"><tspan
        id="tspan3333-6-6-3-8-8"
        x="626.37482"
        y="1041.2275"
diff --git a/src/Mod/TechDraw/Templates/Arch_E2_Landscape.svg b/src/Mod/TechDraw/Templates/Arch_E2_Landscape.svg
index 99b54164fd..8e4053e7c7 100644
--- a/src/Mod/TechDraw/Templates/Arch_E2_Landscape.svg
+++ b/src/Mod/TechDraw/Templates/Arch_E2_Landscape.svg
@@ -1239,7 +1239,7 @@
      stroke-width=".054953"
      word-spacing="0px"
      style="line-height:125%"
-     freecad:editable="DrawingNumber"><tspan
+     freecad:editable="drawing_number"><tspan
        id="tspan3333-6-6-3-8"
        x="825.2323"
        y="631.15521"
diff --git a/src/Mod/TechDraw/Templates/Arch_E2_Portrait.svg b/src/Mod/TechDraw/Templates/Arch_E2_Portrait.svg
index f3b9be216d..17fe80ac17 100644
--- a/src/Mod/TechDraw/Templates/Arch_E2_Portrait.svg
+++ b/src/Mod/TechDraw/Templates/Arch_E2_Portrait.svg
@@ -1239,7 +1239,7 @@
      stroke-width=".054953"
      word-spacing="0px"
      style="line-height:125%"
-     freecad:editable="DrawingNumber"><tspan
+     freecad:editable="drawing_number"><tspan
        id="tspan3333-6-6-3-8"
        x="527.20111"
        y="941.21765"
diff --git a/src/Mod/TechDraw/Templates/Arch_E3_Landscape.svg b/src/Mod/TechDraw/Templates/Arch_E3_Landscape.svg
index d9681a6fc8..f8df3d2c70 100644
--- a/src/Mod/TechDraw/Templates/Arch_E3_Landscape.svg
+++ b/src/Mod/TechDraw/Templates/Arch_E3_Landscape.svg
@@ -1239,7 +1239,7 @@
      stroke-width=".054953"
      word-spacing="0px"
      style="line-height:125%"
-     freecad:editable="DrawingNumber"><tspan
+     freecad:editable="drawing_number"><tspan
        id="tspan3333-6-6-3-8"
        x="849.75153"
        y="655.44116"
diff --git a/src/Mod/TechDraw/Templates/Arch_E3_Portrait.svg b/src/Mod/TechDraw/Templates/Arch_E3_Portrait.svg
index 8a31889674..6c9c405eb4 100644
--- a/src/Mod/TechDraw/Templates/Arch_E3_Portrait.svg
+++ b/src/Mod/TechDraw/Templates/Arch_E3_Portrait.svg
@@ -524,7 +524,7 @@
      stroke-width=".054953"
      word-spacing="0px"
      style="line-height:125%"
-     freecad:editable="DrawingNumber"><tspan
+     freecad:editable="drawing_number"><tspan
        id="tspan3333-6-6-3-8"
        x="551.94928"
        y="966.17102"
diff --git a/src/Mod/TechDraw/Templates/Arch_E_Landscape.svg b/src/Mod/TechDraw/Templates/Arch_E_Landscape.svg
index d951e64e12..db8188da10 100644
--- a/src/Mod/TechDraw/Templates/Arch_E_Landscape.svg
+++ b/src/Mod/TechDraw/Templates/Arch_E_Landscape.svg
@@ -1239,7 +1239,7 @@
      stroke-width=".054953"
      word-spacing="0px"
      style="line-height:125%"
-     freecad:editable="DrawingNumber"><tspan
+     freecad:editable="drawing_number"><tspan
        id="tspan3333-6-6-3-8-0"
        x="1073.1847"
        y="876.60297"
diff --git a/src/Mod/TechDraw/Templates/Arch_E_Portrait.svg b/src/Mod/TechDraw/Templates/Arch_E_Portrait.svg
index 9309085514..718ca4fbed 100644
--- a/src/Mod/TechDraw/Templates/Arch_E_Portrait.svg
+++ b/src/Mod/TechDraw/Templates/Arch_E_Portrait.svg
@@ -1239,7 +1239,7 @@
      stroke-width=".054953"
      word-spacing="0px"
      style="line-height:125%"
-     freecad:editable="DrawingNumber"><tspan
+     freecad:editable="drawing_number"><tspan
        id="tspan3333-6-6-3-8-75"
        x="774.9657"
        y="1190.7511"
diff --git a/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_1_minimal.svg b/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_1_minimal.svg
index 2b7c35111f..672ebbb1d9 100644
--- a/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_1_minimal.svg	
+++ b/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_1_minimal.svg	
@@ -64,7 +64,7 @@
     <text id="legal_owner_2_data_field" x="160" y="13.1" freecad:editable="legal_owner_2" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
     <text id="legal_owner_3_data_field" x="160" y="17.1" freecad:editable="legal_owner_3" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
     <text id="legal_owner_4_data_field" x="160" y="21.1" freecad:editable="legal_owner_4" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
-    <text id="identification_number_data_field" x="1" y="33.2" freecad:editable="identification_number"><tspan>DN</tspan></text>
+    <text id="identification_number_data_field" x="1" y="33.2" freecad:editable="drawing_number"><tspan>DN</tspan></text>
     <text id="revision_index_data_field" x="150" y="33.2" freecad:editable="revision_index" style="text-align:center;text-anchor:middle"><tspan>AAA</tspan></text>
     <text id="date_of_issue_data_field" x="101" y="33.2" freecad:editable="date_of_issue" freecad:autofill="date"><tspan>YYYY-MM-DD</tspan></text>
     <text id="sheet_number_data_field" x="170" y="33.2" freecad:editable="sheet_number" freecad:autofill="sheet" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
diff --git a/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_2.svg b/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_2.svg
index 831835b595..02596c93ac 100644
--- a/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_2.svg	
+++ b/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_2.svg	
@@ -61,7 +61,7 @@
     <text id="owner_2_data_field" x="160" y="13.1" freecad:editable="legal_owner_2" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
     <text id="owner_3_data_field" x="160" y="17.1" freecad:editable="legal_owner_3" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
     <text id="owner_4_data_field" x="160" y="21.1" freecad:editable="legal_owner_4" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
-    <text id="identification_number_data_field" y="33.2" x="1" freecad:editable="identification_number"><tspan>DN</tspan></text>
+    <text id="identification_number_data_field" y="33.2" x="1" freecad:editable="drawing_number"><tspan>DN</tspan></text>
     <text id="revision_index_data_field" x="110" y="33.2" freecad:editable="revision_index" style="text-align:center;text-anchor:middle"><tspan>AAA</tspan></text>
     <text id="date_of_issue_data_field" x="61" y="33.2" freecad:editable="date_of_issue" freecad:autofill="date"><tspan>YYYY-MM-DD</tspan></text>
     <text id="sheet_number_data_field" x="130" y="33.2" freecad:editable="sheet_number" freecad:autofill="sheet" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
diff --git a/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_4.svg b/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_4.svg
index 1b66171c6e..4102e6ebfb 100644
--- a/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_4.svg	
+++ b/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_4.svg	
@@ -67,7 +67,7 @@
     <text id="legal_owner_2_data_field" x="160" y="13.1" freecad:editable="legal_owner_2" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
     <text id="legal_owner_3_data_field" x="160" y="17.1" freecad:editable="legal_owner_3" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
     <text id="legal_owner_4_data_field" x="160" y="21.1" freecad:editable="legal_owner_4" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
-    <text id="identification_number_data_field" x="81" y="33.2" freecad:editable="identification_number"><tspan>DN</tspan></text>
+    <text id="identification_number_data_field" x="81" y="33.2" freecad:editable="drawing_number"><tspan>DN</tspan></text>
     <text id="revision_index_data_field" x="150" y="45.2" freecad:editable="revision_index" style="text-align:center;text-anchor:middle"><tspan>AAA</tspan></text>
     <text id="date_of_issue_data_field" x="101" y="45.2" freecad:editable="date_of_issue" freecad:autofill="date"><tspan>YYYY-MM-DD</tspan></text>
     <text id="sheet_number_data_field" x="170" y="45.2" freecad:editable="sheet_number" freecad:autofill="sheet" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
diff --git a/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_5_maximal.svg b/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_5_maximal.svg
index 681bea4ac2..0c40a6d417 100644
--- a/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_5_maximal.svg	
+++ b/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_5_maximal.svg	
@@ -78,7 +78,7 @@
     <text id="legal_owner_2_data_field" x="160" y="13.1" freecad:editable="legal_owner_2" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
     <text id="legal_owner_3_data_field" x="160" y="17.1" freecad:editable="legal_owner_3" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
     <text id="legal_owner_4_data_field" x="160" y="21.1" freecad:editable="legal_owner_4" style="font-size:3.5px;text-align:center;text-anchor:middle"><tspan> </tspan></text>
-    <text id="identification_number_data_field" x="101" y="45.2" freecad:editable="identification_number"><tspan>DN</tspan></text>
+    <text id="identification_number_data_field" x="101" y="45.2" freecad:editable="drawing_number"><tspan>DN</tspan></text>
     <text id="revision_index_data_field" x="150" y="57.2" freecad:editable="revision_index" style="text-align:center;text-anchor:middle"><tspan>AAA</tspan></text>
     <text id="date_of_issue_data_field" x="101" y="57.2" freecad:editable="date_of_issue" freecad:autofill="date"><tspan>YYYY-MM-DD</tspan></text>
     <text id="sheet_number_data_field" x="170" y="57.2" freecad:editable="sheet_number" freecad:autofill="sheet" style="text-align:center;text-anchor:middle"><tspan>X / Y</tspan></text>
diff --git a/src/Mod/TechDraw/Templates/USLetter_Landscape.svg b/src/Mod/TechDraw/Templates/USLetter_Landscape.svg
index 310f48cd99..1c825f67d2 100644
--- a/src/Mod/TechDraw/Templates/USLetter_Landscape.svg
+++ b/src/Mod/TechDraw/Templates/USLetter_Landscape.svg
@@ -586,7 +586,7 @@
      stroke-width="1px"
      word-spacing="0px"
      style="line-height:0%;text-decoration-line:none;text-indent:0;text-transform:none"
-     freecad:editable="DrawingNumber"><tspan
+     freecad:editable="drawing_number"><tspan
        id="tspan3792-9"
        x="198.43159"
        y="193.43471"
@@ -604,7 +604,7 @@
      stroke-width="1px"
      word-spacing="0px"
      style="line-height:0%;text-decoration-line:none;text-indent:0;text-transform:none"
-     freecad:editable="Revision"><tspan
+     freecad:editable="revision_index"><tspan
        id="tspan3796-0"
        x="252.18163"
        y="193.06583"
diff --git a/src/Mod/TechDraw/Templates/locale/ca/A1_Landscape_ISO5457_minimal.svg b/src/Mod/TechDraw/Templates/locale/ca/A1_Landscape_ISO5457_minimal.svg
index b2c7e644ff..91037eb7d6 100644
--- a/src/Mod/TechDraw/Templates/locale/ca/A1_Landscape_ISO5457_minimal.svg
+++ b/src/Mod/TechDraw/Templates/locale/ca/A1_Landscape_ISO5457_minimal.svg
@@ -615,7 +615,7 @@
        x="821"
        y="581.2"
        style="text-align:center;text-anchor:middle"
-       freecadeditable="sheet_number"
+       freecad:editable="sheet_number"
        freecad:autofill="sheet"><tspan
          id="tspan4">X / Y</tspan></text>
     <text
diff --git a/src/Mod/TechDraw/Templates/locale/ca/A2_Landscape_ISO5457_minimal.svg b/src/Mod/TechDraw/Templates/locale/ca/A2_Landscape_ISO5457_minimal.svg
index 624aee1346..9912ab1a40 100644
--- a/src/Mod/TechDraw/Templates/locale/ca/A2_Landscape_ISO5457_minimal.svg
+++ b/src/Mod/TechDraw/Templates/locale/ca/A2_Landscape_ISO5457_minimal.svg
@@ -484,7 +484,7 @@
          id="Identification number data field"
          x="405"
          y="407.2"
-         freecadeditable="drawing_number"><tspan
+         freecad:editable="drawing_number"><tspan
            id="tspan1">ND</tspan></text>
       <text
          id="Revision index data field"