From cd79b8744f8bf0f025db194ce8d809cb11dfd827 Mon Sep 17 00:00:00 2001
From: wandererfan <wandererfan@gmail.com>
Date: Fri, 10 Feb 2023 21:43:22 -0500
Subject: [PATCH] [TD]centralize balloon prefs

---
 src/Mod/TechDraw/App/DrawViewBalloon.cpp | 28 +++---------------------
 src/Mod/TechDraw/App/DrawViewBalloon.h   |  3 ---
 src/Mod/TechDraw/App/Preferences.cpp     | 20 +++++++++++++++++
 src/Mod/TechDraw/App/Preferences.h       |  2 ++
 4 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/src/Mod/TechDraw/App/DrawViewBalloon.cpp b/src/Mod/TechDraw/App/DrawViewBalloon.cpp
index da5298ef0e..ba0ec7f9f1 100644
--- a/src/Mod/TechDraw/App/DrawViewBalloon.cpp
+++ b/src/Mod/TechDraw/App/DrawViewBalloon.cpp
@@ -70,7 +70,7 @@ DrawViewBalloon::DrawViewBalloon()
     ADD_PROPERTY_TYPE(OriginY, (0), "", (App::PropertyType)(App::Prop_None), "Balloon origin y");
 
     EndType.setEnums(ArrowPropEnum::ArrowTypeEnums);
-    ADD_PROPERTY_TYPE(EndType, (prefEnd()), "", (App::PropertyType)(App::Prop_None),
+    ADD_PROPERTY_TYPE(EndType, (Preferences::balloonArrow()), "", (App::PropertyType)(App::Prop_None),
                       "End symbol for the balloon line");
 
     ADD_PROPERTY_TYPE(EndTypeScale, (1.0), "", (App::PropertyType)(App::Prop_None),
@@ -78,7 +78,7 @@ DrawViewBalloon::DrawViewBalloon()
     EndTypeScale.setConstraints(&SymbolScaleRange);
 
     BubbleShape.setEnums(balloonTypeEnums);
-    ADD_PROPERTY_TYPE(BubbleShape, (prefShape()), "", (App::PropertyType)(App::Prop_None),
+    ADD_PROPERTY_TYPE(BubbleShape, (Preferences::balloonShape()), "", (App::PropertyType)(App::Prop_None),
                       "Shape of the balloon bubble");
 
     ADD_PROPERTY_TYPE(ShapeScale, (1.0), "", (App::PropertyType)(App::Prop_None),
@@ -88,7 +88,7 @@ DrawViewBalloon::DrawViewBalloon()
     ADD_PROPERTY_TYPE(TextWrapLen, (-1), "", (App::PropertyType)(App::Prop_None),
                       "Text wrap length; -1 means no wrap");
 
-    ADD_PROPERTY_TYPE(KinkLength, (prefKinkLength()), "", (App::PropertyType)(App::Prop_None),
+    ADD_PROPERTY_TYPE(KinkLength, (Preferences::balloonKinkLength()), "", (App::PropertyType)(App::Prop_None),
                       "Distance from symbol to leader kink");
 
     SourceView.setScope(App::LinkScope::Global);
@@ -222,28 +222,6 @@ void DrawViewBalloon::setOrigin(Base::Vector3d newOrigin)
     origin = QPointF(newOrigin.x, newOrigin.y);
 }
 
-double DrawViewBalloon::prefKinkLength() const
-{
-    Base::Reference<ParameterGrp> hGrp = App::GetApplication()
-                                             .GetUserParameter()
-                                             .GetGroup("BaseApp")
-                                             ->GetGroup("Preferences")
-                                             ->GetGroup("Mod/TechDraw/Dimensions");
-    return hGrp->GetFloat("BalloonKink", 5.0);
-}
-
-int DrawViewBalloon::prefShape() const
-{
-    Base::Reference<ParameterGrp> hGrp = App::GetApplication()
-                                             .GetUserParameter()
-                                             .GetGroup("BaseApp")
-                                             ->GetGroup("Preferences")
-                                             ->GetGroup("Mod/TechDraw/Decorations");
-    return hGrp->GetInt("BalloonShape", 0);
-}
-
-int DrawViewBalloon::prefEnd() const { return Preferences::balloonArrow(); }
-
 QPointF DrawViewBalloon::getOrigin()
 {
     double x = OriginX.getValue();
diff --git a/src/Mod/TechDraw/App/DrawViewBalloon.h b/src/Mod/TechDraw/App/DrawViewBalloon.h
index 733dd440d5..97af50cff7 100644
--- a/src/Mod/TechDraw/App/DrawViewBalloon.h
+++ b/src/Mod/TechDraw/App/DrawViewBalloon.h
@@ -78,9 +78,6 @@ public:
 
     void handleXYLock() override;
 
-    double prefKinkLength() const;
-    int prefShape() const;
-    int prefEnd() const;
     void setOrigin(Base::Vector3d newOrigin);
 
     Base::Vector3d getOriginOffset() const;
diff --git a/src/Mod/TechDraw/App/Preferences.cpp b/src/Mod/TechDraw/App/Preferences.cpp
index e0d6f41a22..b21fc2f491 100644
--- a/src/Mod/TechDraw/App/Preferences.cpp
+++ b/src/Mod/TechDraw/App/Preferences.cpp
@@ -242,6 +242,26 @@ int Preferences::balloonArrow()
     return end;
 }
 
+double Preferences::balloonKinkLength()
+{
+    Base::Reference<ParameterGrp> hGrp = App::GetApplication()
+                                             .GetUserParameter()
+                                             .GetGroup("BaseApp")
+                                             ->GetGroup("Preferences")
+                                             ->GetGroup("Mod/TechDraw/Dimensions");
+    return hGrp->GetFloat("BalloonKink", 5.0);
+}
+
+int Preferences::balloonShape()
+{
+    Base::Reference<ParameterGrp> hGrp = App::GetApplication()
+                                             .GetUserParameter()
+                                             .GetGroup("BaseApp")
+                                             ->GetGroup("Preferences")
+                                             ->GetGroup("Mod/TechDraw/Decorations");
+    return hGrp->GetInt("BalloonShape", 0);
+}
+
 QString Preferences::defaultTemplate()
 {
     Base::Reference<ParameterGrp> hGrp = App::GetApplication()
diff --git a/src/Mod/TechDraw/App/Preferences.h b/src/Mod/TechDraw/App/Preferences.h
index f3ba116acb..f2cb8fbeb0 100644
--- a/src/Mod/TechDraw/App/Preferences.h
+++ b/src/Mod/TechDraw/App/Preferences.h
@@ -63,6 +63,8 @@ public:
     static int lineGroup();
 
     static int balloonArrow();
+    static double balloonKinkLength();
+    static int balloonShape();
 
     static QString defaultTemplate();
     static QString defaultTemplateDir();