From 5a3de6c3df9b4766b2eb244eba5ec55f25ae5a25 Mon Sep 17 00:00:00 2001
From: wandererfan <wandererfan@gmail.com>
Date: Sun, 11 Aug 2019 13:55:50 -0400
Subject: [PATCH] [TD]Add welding symbol directory preference

---
 src/Mod/TechDraw/Gui/DlgPrefsTechDraw.ui      | 53 +++++++++++++------
 src/Mod/TechDraw/Gui/DlgPrefsTechDrawImp.cpp  |  3 ++
 src/Mod/TechDraw/Gui/SymbolChooser.cpp        |  2 +
 .../Symbols/Welding/AWS/filletUpPlain.svg     | 30 -----------
 4 files changed, 43 insertions(+), 45 deletions(-)
 delete mode 100644 src/Mod/TechDraw/Symbols/Welding/AWS/filletUpPlain.svg

diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw.ui
index 4626cf662fe4..7b75b8ed4416 100644
--- a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw.ui
+++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw.ui
@@ -454,6 +454,23 @@
      <layout class="QVBoxLayout" name="verticalLayout_3">
       <item>
        <layout class="QGridLayout" name="gridLayout_3">
+        <item row="0" column="1">
+         <widget class="Gui::PrefFileChooser" name="pfc_DefTemp">
+          <property name="prefEntry" stdset="0">
+           <cstring>TemplateFile</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>/Mod/TechDraw/Files</cstring>
+          </property>
+         </widget>
+        </item>
+        <item row="4" column="0">
+         <widget class="QLabel" name="label_11">
+          <property name="text">
+           <string>Welding Directory</string>
+          </property>
+         </widget>
+        </item>
         <item row="1" column="0">
          <widget class="QLabel" name="label_2">
           <property name="text">
@@ -468,7 +485,7 @@
           </property>
          </widget>
         </item>
-        <item row="1" column="2">
+        <item row="1" column="1">
          <widget class="Gui::PrefFileChooser" name="pfc_DefDir">
           <property name="mode">
            <enum>Gui::FileChooser::Directory</enum>
@@ -495,17 +512,7 @@
           </property>
          </widget>
         </item>
-        <item row="0" column="2">
-         <widget class="Gui::PrefFileChooser" name="pfc_DefTemp">
-          <property name="prefEntry" stdset="0">
-           <cstring>TemplateFile</cstring>
-          </property>
-          <property name="prefPath" stdset="0">
-           <cstring>/Mod/TechDraw/Files</cstring>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="2">
+        <item row="2" column="1">
          <widget class="Gui::PrefFileChooser" name="pfc_HatchFile">
           <property name="toolTip">
            <string>Location of default svg/png fill file</string>
@@ -518,14 +525,14 @@
           </property>
          </widget>
         </item>
-        <item row="4" column="0">
+        <item row="5" column="0">
          <widget class="QLabel" name="label_9">
           <property name="text">
            <string>PAT File</string>
           </property>
          </widget>
         </item>
-        <item row="4" column="2">
+        <item row="5" column="1">
          <widget class="Gui::PrefFileChooser" name="pfc_FilePattern">
           <property name="toolTip">
            <string>Default location for PAT file</string>
@@ -538,7 +545,7 @@
           </property>
          </widget>
         </item>
-        <item row="3" column="2">
+        <item row="3" column="1">
          <widget class="Gui::PrefFileChooser" name="pfc_LineGroup">
           <property name="toolTip">
            <string>Alternate Line Group file</string>
@@ -551,6 +558,22 @@
           </property>
          </widget>
         </item>
+        <item row="4" column="1">
+         <widget class="Gui::PrefFileChooser" name="pfc_Welding">
+          <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>
+          <property name="prefPath" stdset="0">
+           <cstring>/Mod/TechDraw/Files</cstring>
+          </property>
+         </widget>
+        </item>
        </layout>
       </item>
       <item>
diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawImp.cpp b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawImp.cpp
index 8e2e98c374ac..ff532ecc9261 100644
--- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawImp.cpp
+++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawImp.cpp
@@ -68,6 +68,8 @@ void DlgPrefsTechDrawImp::saveSettings()
     pfc_DefDir->onSave();
     pfc_HatchFile->onSave();
     pfc_LineGroup->onSave();
+    pfc_Welding->onSave();
+
     pfc_FilePattern->onSave();
     le_NamePattern->onSave();
 }
@@ -97,6 +99,7 @@ void DlgPrefsTechDrawImp::loadSettings()
     pfc_DefDir->onRestore();
     pfc_HatchFile->onRestore();
     pfc_LineGroup->onRestore();
+    pfc_Welding->onRestore();
 
     pfc_FilePattern->onRestore();
     le_NamePattern->onRestore();
diff --git a/src/Mod/TechDraw/Gui/SymbolChooser.cpp b/src/Mod/TechDraw/Gui/SymbolChooser.cpp
index 3ed8a9e80948..936a97208fae 100644
--- a/src/Mod/TechDraw/Gui/SymbolChooser.cpp
+++ b/src/Mod/TechDraw/Gui/SymbolChooser.cpp
@@ -69,6 +69,8 @@ void SymbolChooser::setUiPrimary()
         loadSymbolNames(m_symbolDir);
     } else {
         std::string resourceDir = App::Application::getResourceDir();
+        std::string defPath = "Mod/TechDraw/Symbols/Welding/AWS/";
+        resourceDir = resourceDir + defPath; 
         QString defDir = QString::fromUtf8(resourceDir.c_str());
         ui->fcSymbolDir->setFileName(defDir);
         loadSymbolNames(defDir);
diff --git a/src/Mod/TechDraw/Symbols/Welding/AWS/filletUpPlain.svg b/src/Mod/TechDraw/Symbols/Welding/AWS/filletUpPlain.svg
deleted file mode 100644
index 49de22b4eb0f..000000000000
--- a/src/Mod/TechDraw/Symbols/Welding/AWS/filletUpPlain.svg
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg3085"
-   height="64"
-   width="64"
-   version="1.1">
-  <defs
-     id="defs3087" />
-  <metadata
-     id="metadata3090">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <path
-     id="path1016"
-     d="M 58.663735,60 H 2.6637352 V 4 Z"
-     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.88976383;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-</svg>