From e56897df76530eb9e32d28f385c0957f0b4e6c21 Mon Sep 17 00:00:00 2001 From: Markus Lampert Date: Sat, 23 Sep 2017 13:40:47 -0700 Subject: [PATCH] Switch preferences to use json files for templates. --- src/Mod/Path/PathScripts/PathPreferences.py | 5 ++++- src/Mod/Path/PathScripts/PathPreferencesPathJob.py | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Mod/Path/PathScripts/PathPreferences.py b/src/Mod/Path/PathScripts/PathPreferences.py index dd2d75ca15..2c1f336d60 100644 --- a/src/Mod/Path/PathScripts/PathPreferences.py +++ b/src/Mod/Path/PathScripts/PathPreferences.py @@ -118,7 +118,10 @@ class PathPreferences: @classmethod def defaultJobTemplate(cls): - return cls.preferences().GetString(cls.DefaultJobTemplate) + template = cls.preferences().GetString(cls.DefaultJobTemplate) + if 'xml' not in template: + return template + return '' @classmethod def setJobDefaults(cls, filePath, jobTemplate, geometryTolerance): diff --git a/src/Mod/Path/PathScripts/PathPreferencesPathJob.py b/src/Mod/Path/PathScripts/PathPreferencesPathJob.py index 605358ffa1..34e4a0934b 100644 --- a/src/Mod/Path/PathScripts/PathPreferencesPathJob.py +++ b/src/Mod/Path/PathScripts/PathPreferencesPathJob.py @@ -163,7 +163,7 @@ class JobPreferencesPage: foo = QtGui.QFileDialog.getOpenFileName(QtGui.qApp.activeWindow(), "Path - Job Template", path, - "job_*.xml")[0] + "job_*.json")[0] if foo: self.form.leDefaultJobTemplate.setText(foo)