From 0457b196a2d0f603b9ae8aae98c6ae0bc1e768a8 Mon Sep 17 00:00:00 2001 From: Markus Lampert Date: Wed, 20 Sep 2017 13:57:29 -0700 Subject: [PATCH] Changed path tool library manager to use different preference for json library than for xml in order to not break old installations. --- src/Mod/Path/PathScripts/PathToolLibraryManager.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/Mod/Path/PathScripts/PathToolLibraryManager.py b/src/Mod/Path/PathScripts/PathToolLibraryManager.py index a9c3efb94c..a2db80e4c1 100644 --- a/src/Mod/Path/PathScripts/PathToolLibraryManager.py +++ b/src/Mod/Path/PathScripts/PathToolLibraryManager.py @@ -148,6 +148,9 @@ class ToolLibraryManager(): TooltableTypeHeekscad = translate("TooltableEditor", "HeeksCAD tooltable (*.tooltable)") TooltableTypeLinuxCNC = translate("TooltableEditor", "LinuxCNC tooltable (*.tbl)") + PreferenceMainLibraryXML = "ToolLibrary" + PreferenceMainLibraryJSON = "ToolLibrary-Main" + def __init__(self): self.prefs = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Path") return @@ -171,7 +174,7 @@ class ToolLibraryManager(): def saveMainLibrary(self, tooltable): '''Persists the permanent library to FreeCAD user preferences''' tmpstring = json.dumps(self.templateAttrs(tooltable)) - self.prefs.SetString("ToolLibrary", tmpstring) + self.prefs.SetString(self.PreferenceMainLibraryJSON, tmpstring) return True def getLists(self): @@ -190,7 +193,9 @@ class ToolLibraryManager(): def _findList(self, listname): tt = None if listname == "
": - tmpstring = self.prefs.GetString("ToolLibrary", "") + tmpstring = self.prefs.GetString(self.PreferenceMainLibraryJSON, "") + if not tmpstring: + tmpstring = self.prefs.GetString(self.PreferenceMainLibraryXML, "") if tmpstring: if tmpstring[0] == '{': tt = self.tooltableFromAttrs(json.loads(tmpstring))