From 20f28b3fa2c2b78b13fb08f2627e7e74baf3b01f Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 11 Apr 2017 09:17:46 +0200 Subject: [PATCH 1/2] Set dir names in config to allow UM detect old cura dir CURA-3529 --- cura/CuraApplication.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 037bf124a1..eb85f00a12 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -109,6 +109,10 @@ class CuraApplication(QtApplication): Q_ENUMS(ResourceTypes) def __init__(self): + # this list of dir names will be used by UM to detect an old cura directory + for dir_name in ["extruders", "machine_instances", "materials", "plugins", "quality", "user", "variants"]: + Resources.addExpectedDirNameInConfig(dir_name) + Resources.addSearchPath(os.path.join(QtApplication.getInstallPrefix(), "share", "cura", "resources")) if not hasattr(sys, "frozen"): Resources.addSearchPath(os.path.join(os.path.abspath(os.path.dirname(__file__)), "..", "resources")) From f56dc3d09e6e605a76750f3c725df21dafd6b7c9 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 11 Apr 2017 17:01:16 +0200 Subject: [PATCH 2/2] Fixed copying for Linux CURA-3529 --- cura/CuraApplication.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index eb85f00a12..369727708d 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -111,7 +111,7 @@ class CuraApplication(QtApplication): def __init__(self): # this list of dir names will be used by UM to detect an old cura directory for dir_name in ["extruders", "machine_instances", "materials", "plugins", "quality", "user", "variants"]: - Resources.addExpectedDirNameInConfig(dir_name) + Resources.addExpectedDirNameInData(dir_name) Resources.addSearchPath(os.path.join(QtApplication.getInstallPrefix(), "share", "cura", "resources")) if not hasattr(sys, "frozen"):