GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 06:28:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Clean up some paths

Browse Source 
CURA-11483
This commit is contained in:
c.lamboo 2024-02-05 11:30:15 +01:00
parent 54d6315f28
commit 0f6f18e7dd
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cura/CuraApplication.py
View File

@ -374,14 +374,15 @@ class CuraApplication(QtApplication):
app_root = os.path.abspath(os.path.join(os.path.dirname(sys.executable))) app_root = os.path.abspath(os.path.join(os.path.dirname(sys.executable)))
Resources.addSecureSearchPath(os.path.join(app_root, "share", "cura", "resources")) if platform.system() == "Darwin":
Resources.addSecureSearchPath(os.path.join(app_root, "Resources", "share", "cura", "resources")) Resources.addSecureSearchPath(os.path.join(app_root, "Resources", "share", "cura", "resources"))
Resources.addSecureSearchPath(os.path.join(app_root, "..", "Resources", "share", "cura", "resources")) Resources.addSecureSearchPath(os.path.join(app_root, "..", "Resources", "share", "cura", "resources"))
Resources.addSecureSearchPath(os.path.join(self._app_install_dir, "share", "cura", "resources"))
Resources.addSecureSearchPath(os.path.join(self._app_install_dir, "Resources", "share", "cura", "resources"))
Resources.addSecureSearchPath( Resources.addSecureSearchPath(
os.path.join(self._app_install_dir, "..", "Resources", "share", "cura", "resources")) os.path.join(self._app_install_dir, "..", "Resources", "share", "cura", "resources"))
else:
Resources.addSecureSearchPath(os.path.join(app_root, "share", "cura", "resources"))
Resources.addSecureSearchPath(os.path.join(self._app_install_dir, "share", "cura", "resources"))
Resources.addSecureSearchPath(os.path.join(app_root, "Resources", "share", "cura", "resources"))
if not hasattr(sys, "frozen"): if not hasattr(sys, "frozen"):
cura_data_root = os.environ.get('CURA_DATA_ROOT', None) cura_data_root = os.environ.get('CURA_DATA_ROOT', None)
@ -396,7 +397,6 @@ class CuraApplication(QtApplication):
# venv site-packages # venv site-packages
Resources.addSearchPath(os.path.join(app_root, "..", "share", "cura", "resources")) Resources.addSearchPath(os.path.join(app_root, "..", "share", "cura", "resources"))
Resources.addSearchPath(os.path.join(app_root, "..", "Resources", "share", "cura", "resources"))
@classmethod @classmethod
def _initializeSettingDefinitions(cls): def _initializeSettingDefinitions(cls):