kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Add support for alternate LineGroup file

Browse Source
This commit is contained in:
wandererfan
2018-07-20 20:38:25 -04:00
committed by Yorik van Havre
parent 5a39efa771
commit 8ba4cd1058
3 changed files with 32 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Mod/TechDraw/App/LineGroup.cpp
View File

@@ -180,6 +180,9 @@ LineGroup* LineGroup::lineGroupFactory(std::string groupName)
std::string defaultFileName = defaultDir + "LineGroup.csv";
std::string lgFileName = hGrp->GetASCII("LineGroupFile",defaultFileName.c_str());
if (lgFileName.empty()) {
lgFileName = defaultFileName;
}
std::string lgRecord = LineGroup::getRecordFromFile(lgFileName, groupName);

34
src/Mod/TechDraw/Gui/DlgPrefsTechDraw.ui
View File

@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>558</width>
<height>742</height>
<height>845</height>
</rect>
</property>
<property name="windowTitle">
@@ -449,7 +449,7 @@
</property>
</widget>
</item>
<item row="1" column="1">
<item row="1" column="2">
<widget class="Gui::PrefFileChooser" name="pfc_DefDir">
<property name="mode">
<enum>Gui::FileChooser::Directory</enum>
@@ -469,7 +469,14 @@
</property>
</widget>
</item>
<item row="0" column="1">
<item row="3" column="0">
<widget class="QLabel" name="label_10">
<property name="text">
<string>Line Group File</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="Gui::PrefFileChooser" name="pfc_DefTemp">
<property name="prefEntry" stdset="0">
<cstring>TemplateFile</cstring>
@@ -479,7 +486,7 @@
</property>
</widget>
</item>
<item row="2" column="1">
<item row="2" column="2">
<widget class="Gui::PrefFileChooser" name="pfc_HatchFile">
<property name="toolTip">
<string>Location of default svg/png fill file</string>
@@ -492,14 +499,14 @@
</property>
</widget>
</item>
<item row="3" column="0">
<item row="4" column="0">
<widget class="QLabel" name="label_9">
<property name="text">
<string>PAT File</string>
</property>
</widget>
</item>
<item row="3" column="1">
<item row="4" column="2">
<widget class="Gui::PrefFileChooser" name="pfc_FilePattern">
<property name="toolTip">
<string>Default location for PAT file</string>
@@ -512,6 +519,19 @@
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="Gui::PrefFileChooser" name="pfc_LineGroup">
<property name="toolTip">
<string>Alternate Line Group file</string>
</property>
<property name="prefEntry" stdset="0">
<cstring>LineGroupFile</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>/Mod/TechDraw/Files</cstring>
</property>
</widget>
</item>
</layout>
</item>
<item>
@@ -618,7 +638,7 @@
</property>
<property name="currentFont">
<font>
<family>osifont</family>
<family>DejaVu Sans</family>
</font>
</property>
<property name="prefEntry" stdset="0">

3
src/Mod/TechDraw/Gui/DlgPrefsTechDrawImp.cpp
View File

@@ -66,6 +66,7 @@ void DlgPrefsTechDrawImp::saveSettings()
pfc_DefTemp->onSave();
pfc_DefDir->onSave();
pfc_HatchFile->onSave();
pfc_LineGroup->onSave();
pfc_FilePattern->onSave();
le_NamePattern->onSave();
}
@@ -93,7 +94,7 @@ void DlgPrefsTechDrawImp::loadSettings()
pfc_DefTemp->onRestore();
pfc_DefDir->onRestore();
pfc_HatchFile->onRestore();
pfc_LineGroup->onRestore();
pfc_FilePattern->onRestore();
le_NamePattern->onRestore();