From 94940f950b16bca6f05da943ef72b480824bc668 Mon Sep 17 00:00:00 2001
From: wandererfan <wandererfan@gmail.com>
Date: Fri, 5 Jul 2024 09:40:19 -0400
Subject: [PATCH] [TD]fix default for KeepLabel

---
 src/Mod/TechDraw/App/Preferences.cpp          |  6 ++++++
 src/Mod/TechDraw/App/Preferences.h            |  1 +
 .../TechDraw/Gui/DlgPrefsTechDrawGeneral.ui   | 21 +++++++++++++++++++
 .../Gui/DlgPrefsTechDrawGeneralImp.cpp        |  2 ++
 .../TechDraw/Gui/ViewProviderDrawingView.cpp  |  5 ++++-
 5 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/src/Mod/TechDraw/App/Preferences.cpp b/src/Mod/TechDraw/App/Preferences.cpp
index 2a8f035388..e29dbe708c 100644
--- a/src/Mod/TechDraw/App/Preferences.cpp
+++ b/src/Mod/TechDraw/App/Preferences.cpp
@@ -593,3 +593,9 @@ bool Preferences::useCameraDirection()
 {
     return getPreferenceGroup("General")->GetBool("UseCameraDirection", false);
 }
+
+
+bool Preferences::alwaysShowLabel()
+{
+    return getPreferenceGroup("General")->GetBool("AlwaysShowLabel", false);
+}
diff --git a/src/Mod/TechDraw/App/Preferences.h b/src/Mod/TechDraw/App/Preferences.h
index 4e683f122b..d55b3e8b84 100644
--- a/src/Mod/TechDraw/App/Preferences.h
+++ b/src/Mod/TechDraw/App/Preferences.h
@@ -137,6 +137,7 @@ public:
     static bool useExactMatchOnDims();
 
     static bool useCameraDirection();
+    static bool alwaysShowLabel();
 };
 
 
diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneral.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneral.ui
index 240fdc883c..243795b859 100644
--- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneral.ui
+++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneral.ui
@@ -1034,6 +1034,27 @@ for ProjectionGroups</string>
           </property>
          </widget>
         </item>
+        <item>
+         <widget class="Gui::PrefCheckBox" name="cb_alwaysShowLabel">
+          <property name="font">
+           <font>
+            <italic>true</italic>
+           </font>
+          </property>
+          <property name="toolTip">
+           <string>If checked, view labels will be displayed even when frames are suppressed.</string>
+          </property>
+          <property name="text">
+           <string>Always Show Label</string>
+          </property>
+          <property name="prefEntry" stdset="0">
+           <cstring>AlwaysShowLabel</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>/Mod/TechDraw/General</cstring>
+          </property>
+         </widget>
+        </item>
        </layout>
       </item>
      </layout>
diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneralImp.cpp b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneralImp.cpp
index 0e6bde7f44..1363e0c9db 100644
--- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneralImp.cpp
+++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneralImp.cpp
@@ -78,6 +78,7 @@ void DlgPrefsTechDrawGeneralImp::saveSettings()
     ui->cbMultiSelection->onSave();
 
     ui->cb_useCameraDirection->onSave();
+    ui->cb_alwaysShowLabel->onSave();
 }
 
 void DlgPrefsTechDrawGeneralImp::loadSettings()
@@ -122,6 +123,7 @@ void DlgPrefsTechDrawGeneralImp::loadSettings()
     ui->cbMultiSelection->onRestore();
 
     ui->cb_useCameraDirection->onRestore();
+    ui->cb_alwaysShowLabel->onRestore();
 }
 
 /**
diff --git a/src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp b/src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp
index b7b1c801ce..2ef5185365 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp
@@ -40,6 +40,7 @@
 
 #include <Mod/TechDraw/App/DrawPage.h>
 #include <Mod/TechDraw/App/DrawView.h>
+#include <Mod/TechDraw/App/Preferences.h>
 
 #include "ViewProviderDrawingView.h"
 #include "ViewProviderDrawingViewExtension.h"
@@ -49,6 +50,7 @@
 #include "ViewProviderPage.h"
 
 using namespace TechDrawGui;
+using namespace TechDraw;
 namespace sp = std::placeholders;
 
 PROPERTY_SOURCE(TechDrawGui::ViewProviderDrawingView, Gui::ViewProviderDocumentObject)
@@ -62,7 +64,8 @@ ViewProviderDrawingView::ViewProviderDrawingView() :
     sPixmap = "TechDraw_TreeView";
     static const char *group = "Base";
 
-    ADD_PROPERTY_TYPE(KeepLabel ,(false), group, App::Prop_None, "Keep Label on Page even if toggled off");
+    auto showLabel = Preferences::alwaysShowLabel();
+    ADD_PROPERTY_TYPE(KeepLabel ,(showLabel), group, App::Prop_None, "Keep Label on Page even if toggled off");
     ADD_PROPERTY_TYPE(StackOrder,(0),group,App::Prop_None,"Over or under lap relative to other views");
 
     // Do not show in property editor   why? wf  WF: because DisplayMode applies only to coin and we