From c485904ab8a8bbf263c8c7076b2a9dae3e8939f8 Mon Sep 17 00:00:00 2001
From: wandererfan <wandererfan@gmail.com>
Date: Tue, 10 Mar 2020 14:09:01 -0400
Subject: [PATCH] [TD]make Arrow enums translatable

---
 src/Mod/TechDraw/App/ArrowPropEnum.cpp | 16 ++++++++--------
 src/Mod/TechDraw/App/ArrowPropEnum.h   |  5 +++--
 src/Mod/TechDraw/Gui/DrawGuiUtil.cpp   |  2 +-
 src/Mod/TechDraw/Gui/DrawGuiUtil.h     |  2 ++
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/Mod/TechDraw/App/ArrowPropEnum.cpp b/src/Mod/TechDraw/App/ArrowPropEnum.cpp
index 7e8a2e0d0b..17fe098fb2 100644
--- a/src/Mod/TechDraw/App/ArrowPropEnum.cpp
+++ b/src/Mod/TechDraw/App/ArrowPropEnum.cpp
@@ -30,14 +30,14 @@
 namespace TechDraw {
 
 const int   ArrowPropEnum::ArrowCount = 8;
-const char* ArrowPropEnum::ArrowTypeEnums[]= { "NONE",
-                               "FILLED_ARROW",
-                               "OPEN_ARROW",
-                               "TICK",
-                               "DOT",
-                               "OPEN_CIRCLE",
-                               "FORK",
-                               "FILLED_TRIANGLE",
+const char* ArrowPropEnum::ArrowTypeEnums[]= { "None",
+                               "Filled_Arrow",
+                               "Open_Arrow",
+                               "Tick",
+                               "Dot",
+                               "Open_Circle",
+                               "Fork",
+                               "Filled_Triangle",
                                NULL};
 
 const std::vector<std::string> ArrowPropEnum::ArrowTypeIcons = { ":icons/arrownone.svg",
diff --git a/src/Mod/TechDraw/App/ArrowPropEnum.h b/src/Mod/TechDraw/App/ArrowPropEnum.h
index 5a81170b8f..be135d6dcd 100644
--- a/src/Mod/TechDraw/App/ArrowPropEnum.h
+++ b/src/Mod/TechDraw/App/ArrowPropEnum.h
@@ -26,7 +26,7 @@
 #include <cstdlib>
 #include <vector>
 #include <string>
-
+#include <QCoreApplication>
 
 namespace TechDraw
 {
@@ -42,8 +42,9 @@ enum ArrowType { NONE = 0,
                  FILLED_TRIANGLE };
 
 class TechDrawExport ArrowPropEnum {
+    Q_DECLARE_TR_FUNCTIONS(TechDraw::ArrowPropEnum)
+
     public:
-    
         static const char* ArrowTypeEnums[];
         static const int   ArrowCount;
         static const std::vector<std::string> ArrowTypeIcons;
diff --git a/src/Mod/TechDraw/Gui/DrawGuiUtil.cpp b/src/Mod/TechDraw/Gui/DrawGuiUtil.cpp
index 2787b113f4..15808e75a5 100644
--- a/src/Mod/TechDraw/Gui/DrawGuiUtil.cpp
+++ b/src/Mod/TechDraw/Gui/DrawGuiUtil.cpp
@@ -88,7 +88,7 @@ void DrawGuiUtil::loadArrowBox(QComboBox* qcb)
     qcb->clear();
     int i = 0;
     for (; i < ArrowPropEnum::ArrowCount; i++) {
-        qcb->addItem(QString::fromUtf8(ArrowPropEnum::ArrowTypeEnums[i]));
+        qcb->addItem(tr(ArrowPropEnum::ArrowTypeEnums[i]));
         QIcon itemIcon(QString::fromUtf8(ArrowPropEnum::ArrowTypeIcons[i].c_str()));
         qcb->setItemIcon(i, itemIcon);
     }
diff --git a/src/Mod/TechDraw/Gui/DrawGuiUtil.h b/src/Mod/TechDraw/Gui/DrawGuiUtil.h
index 8020a59e75..0a8c893a52 100644
--- a/src/Mod/TechDraw/Gui/DrawGuiUtil.h
+++ b/src/Mod/TechDraw/Gui/DrawGuiUtil.h
@@ -24,6 +24,7 @@
 #define _DrawGuiUtil_h_
 
 #include <string>
+#include <QCoreApplication>
 #include <QRectF>
 #include <QPointF>
 #include <QComboBox>
@@ -47,6 +48,7 @@ namespace TechDrawGui
 
 /// Convenient utility functions for TechDraw Gui Module
 class TechDrawGuiExport DrawGuiUtil {
+    Q_DECLARE_TR_FUNCTIONS(TechDrawGui::DrawGuiUtil)
     public:
     static TechDraw::DrawPage* findPage(Gui::Command* cmd);
     static bool needPage(Gui::Command* cmd);