From e983ca39110b0680f4e96a236d4687215a0bd8f3 Mon Sep 17 00:00:00 2001
From: wandererfan <wandererfan@gmail.com>
Date: Thu, 6 Feb 2020 14:32:52 -0500
Subject: [PATCH] [TD]fix Preference dialog keys

---
 src/Mod/TechDraw/App/DrawView.cpp         |  3 +-
 src/Mod/TechDraw/Gui/DlgPrefsTechDraw1.ui | 44 +++++++++++++----------
 src/Mod/TechDraw/Gui/DlgPrefsTechDraw4.ui |  4 +--
 3 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/src/Mod/TechDraw/App/DrawView.cpp b/src/Mod/TechDraw/App/DrawView.cpp
index 4920d6228d..f23caf1293 100644
--- a/src/Mod/TechDraw/App/DrawView.cpp
+++ b/src/Mod/TechDraw/App/DrawView.cpp
@@ -441,11 +441,10 @@ double DrawView::prefScale(void)
 {
     Base::Reference<ParameterGrp> hGrp = App::GetApplication().GetUserParameter()
           .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/General");
-    double result = hGrp->GetInt("DefaultViewScale", 1.0); 
+    double result = hGrp->GetFloat("DefaultViewScale", 1.0); 
     return result;
 }
 
-
 void DrawView::requestPaint(void)
 {
 //    Base::Console().Message("DV::requestPaint() - %s\n", getNameInDocument());
diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw1.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw1.ui
index 27c66fc48a..2ee018e38b 100644
--- a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw1.ui
+++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw1.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>439</width>
+    <width>460</width>
     <height>829</height>
    </rect>
   </property>
@@ -216,7 +216,7 @@ for ProjectionGroups</string>
           <property name="toolTip">
            <string>Normal line color</string>
           </property>
-          <property name="color" stdset="0">
+          <property name="color">
            <color>
             <red>0</red>
             <green>0</green>
@@ -286,7 +286,7 @@ for ProjectionGroups</string>
           <property name="toolTip">
            <string>Preselection color</string>
           </property>
-          <property name="color" stdset="0">
+          <property name="color">
            <color>
             <red>255</red>
             <green>255</green>
@@ -318,7 +318,7 @@ for ProjectionGroups</string>
           <property name="toolTip">
            <string>Section face color</string>
           </property>
-          <property name="color" stdset="0">
+          <property name="color">
            <color>
             <red>225</red>
             <green>225</green>
@@ -350,7 +350,7 @@ for ProjectionGroups</string>
           <property name="toolTip">
            <string>Selected item color</string>
           </property>
-          <property name="color" stdset="0">
+          <property name="color">
            <color>
             <red>28</red>
             <green>173</green>
@@ -382,7 +382,7 @@ for ProjectionGroups</string>
           <property name="toolTip">
            <string>Section face hatch color</string>
           </property>
-          <property name="color" stdset="0">
+          <property name="color">
            <color>
             <red>0</red>
             <green>0</green>
@@ -414,7 +414,7 @@ for ProjectionGroups</string>
           <property name="toolTip">
            <string>Window background color</string>
           </property>
-          <property name="color" stdset="0">
+          <property name="color">
            <color>
             <red>80</red>
             <green>80</green>
@@ -446,7 +446,7 @@ for ProjectionGroups</string>
           <property name="toolTip">
            <string>Geometric hatch color</string>
           </property>
-          <property name="color" stdset="0">
+          <property name="color">
            <color>
             <red>0</red>
             <green>0</green>
@@ -473,7 +473,7 @@ for ProjectionGroups</string>
           <property name="toolTip">
            <string>Color of Dimension lines and text.</string>
           </property>
-          <property name="color" stdset="0">
+          <property name="color">
            <color>
             <red>0</red>
             <green>0</green>
@@ -565,7 +565,7 @@ for ProjectionGroups</string>
           <property name="toolTip">
            <string>Face color</string>
           </property>
-          <property name="color" stdset="0">
+          <property name="color">
            <color>
             <red>255</red>
             <green>255</green>
@@ -597,7 +597,7 @@ for ProjectionGroups</string>
           <property name="toolTip">
            <string>Default color for annotations </string>
           </property>
-          <property name="color" stdset="0">
+          <property name="color">
            <color>
             <red>0</red>
             <green>0</green>
@@ -733,7 +733,7 @@ for ProjectionGroups</string>
          </spacer>
         </item>
         <item row="1" column="2">
-         <widget class="Gui::PrefUnitSpinBox" name="plsb_LabelSize" native="true">
+         <widget class="Gui::PrefUnitSpinBox" name="plsb_LabelSize">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
             <horstretch>0</horstretch>
@@ -743,7 +743,7 @@ for ProjectionGroups</string>
           <property name="toolTip">
            <string>Label size</string>
           </property>
-          <property name="value" stdset="0">
+          <property name="value">
            <double>8.000000000000000</double>
           </property>
           <property name="prefEntry" stdset="0">
@@ -793,7 +793,7 @@ for ProjectionGroups</string>
          </widget>
         </item>
         <item row="0" column="2">
-         <widget class="Gui::PrefFileChooser" name="pfc_DefTemp" native="true">
+         <widget class="Gui::PrefFileChooser" name="pfc_DefTemp">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
             <horstretch>0</horstretch>
@@ -844,7 +844,7 @@ for ProjectionGroups</string>
          </spacer>
         </item>
         <item row="1" column="2">
-         <widget class="Gui::PrefFileChooser" name="pfc_DefDir" native="true">
+         <widget class="Gui::PrefFileChooser" name="pfc_DefDir">
           <property name="minimumSize">
            <size>
             <width>0</width>
@@ -854,6 +854,9 @@ for ProjectionGroups</string>
           <property name="toolTip">
            <string>Starting directory for menu 'Insert Page using Template'</string>
           </property>
+          <property name="mode">
+           <enum>Gui::FileChooser::Directory</enum>
+          </property>
           <property name="prefEntry" stdset="0">
            <cstring>TemplateDir</cstring>
           </property>
@@ -881,7 +884,7 @@ for ProjectionGroups</string>
          </widget>
         </item>
         <item row="2" column="2">
-         <widget class="Gui::PrefFileChooser" name="pfc_HatchFile" native="true">
+         <widget class="Gui::PrefFileChooser" name="pfc_HatchFile">
           <property name="minimumSize">
            <size>
             <width>0</width>
@@ -918,7 +921,7 @@ for ProjectionGroups</string>
          </widget>
         </item>
         <item row="3" column="2">
-         <widget class="Gui::PrefFileChooser" name="pfc_LineGroup" native="true">
+         <widget class="Gui::PrefFileChooser" name="pfc_LineGroup">
           <property name="minimumSize">
            <size>
             <width>0</width>
@@ -955,7 +958,7 @@ for ProjectionGroups</string>
          </widget>
         </item>
         <item row="4" column="2">
-         <widget class="Gui::PrefFileChooser" name="pfc_Welding" native="true">
+         <widget class="Gui::PrefFileChooser" name="pfc_Welding">
           <property name="minimumSize">
            <size>
             <width>0</width>
@@ -965,6 +968,9 @@ for ProjectionGroups</string>
           <property name="toolTip">
            <string>Default directory for welding symbols</string>
           </property>
+          <property name="mode">
+           <enum>Gui::FileChooser::Directory</enum>
+          </property>
           <property name="prefEntry" stdset="0">
            <cstring>WeldingDir</cstring>
           </property>
@@ -992,7 +998,7 @@ for ProjectionGroups</string>
          </widget>
         </item>
         <item row="5" column="2">
-         <widget class="Gui::PrefFileChooser" name="pfc_FilePattern" native="true">
+         <widget class="Gui::PrefFileChooser" name="pfc_FilePattern">
           <property name="minimumSize">
            <size>
             <width>0</width>
diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw4.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw4.ui
index aa7d47f037..3df8e9177e 100644
--- a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw4.ui
+++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw4.ui
@@ -172,10 +172,10 @@ can be a performance penalty in complex models.</string>
            <bool>true</bool>
           </property>
           <property name="prefEntry" stdset="0">
-           <cstring>UseGlobalDecimals</cstring>
+           <cstring>HandleFaces</cstring>
           </property>
           <property name="prefPath" stdset="0">
-           <cstring>/Mod/TechDraw/Dimensions</cstring>
+           <cstring>/Mod/TechDraw/General</cstring>
           </property>
          </widget>
         </item>