From: daid Date: Wed, 12 Feb 2014 11:58:18 +0000 (+0100) Subject: Move resources and plugins out of the Cura python package. X-Git-Tag: 14.02-RC1~15 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=c9ba5d1049a427e295ebc5ec4239efae75bd0bd4;p=cura.git Move resources and plugins out of the Cura python package. --- diff --git a/Cura/util/profile.py b/Cura/util/profile.py index c8d88114..dbc8b7aa 100644 --- a/Cura/util/profile.py +++ b/Cura/util/profile.py @@ -1059,9 +1059,9 @@ def getPluginBasePaths(): if platform.system() != "Windows": ret.append(os.path.expanduser('~/.cura/plugins/')) if platform.system() == "Darwin" and hasattr(sys, 'frozen'): - ret.append(os.path.normpath(os.path.join(resources.resourceBasePath, "Cura/plugins"))) + ret.append(os.path.normpath(os.path.join(resources.resourceBasePath, "plugins"))) else: - ret.append(os.path.normpath(os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', 'plugins'))) + ret.append(os.path.normpath(os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', '..', 'plugins'))) return ret def getPluginList(): diff --git a/Cura/util/resources.py b/Cura/util/resources.py index 1d7bcc47..0af45dbe 100644 --- a/Cura/util/resources.py +++ b/Cura/util/resources.py @@ -26,12 +26,9 @@ if sys.platform.startswith('darwin'): except: resourceBasePath = os.path.join(os.path.dirname(__file__), "../../../../../") else: - resourceBasePath = os.path.join(os.path.dirname(__file__), "../resources") -else: - if hasattr(sys, 'frozen'): resourceBasePath = os.path.join(os.path.dirname(__file__), "../../resources") - else: - resourceBasePath = os.path.join(os.path.dirname(__file__), "../resources") +else: + resourceBasePath = os.path.join(os.path.dirname(__file__), "../../resources") def getPathForResource(dir, subdir, resource_name): assert os.path.isdir(dir), "{p} is not a directory".format(p=dir) diff --git a/Cura/plugins/TweakAtZ.py b/plugins/TweakAtZ.py similarity index 100% rename from Cura/plugins/TweakAtZ.py rename to plugins/TweakAtZ.py diff --git a/Cura/plugins/pauseAtZ.py b/plugins/pauseAtZ.py similarity index 100% rename from Cura/plugins/pauseAtZ.py rename to plugins/pauseAtZ.py diff --git a/Cura/resources/Attribution.txt b/resources/Attribution.txt similarity index 100% rename from Cura/resources/Attribution.txt rename to resources/Attribution.txt diff --git a/Cura/resources/Cura.icns b/resources/Cura.icns similarity index 100% rename from Cura/resources/Cura.icns rename to resources/Cura.icns diff --git a/Cura/resources/cura.ico b/resources/cura.ico similarity index 100% rename from Cura/resources/cura.ico rename to resources/cura.ico diff --git a/Cura/resources/example/Attribution.txt b/resources/example/Attribution.txt similarity index 100% rename from Cura/resources/example/Attribution.txt rename to resources/example/Attribution.txt diff --git a/Cura/resources/example/UltimakerHandle.stl b/resources/example/UltimakerHandle.stl similarity index 100% rename from Cura/resources/example/UltimakerHandle.stl rename to resources/example/UltimakerHandle.stl diff --git a/Cura/resources/example/UltimakerRobot_support.stl b/resources/example/UltimakerRobot_support.stl similarity index 100% rename from Cura/resources/example/UltimakerRobot_support.stl rename to resources/example/UltimakerRobot_support.stl diff --git a/Cura/resources/firmware/Attribution.txt b/resources/firmware/Attribution.txt similarity index 100% rename from Cura/resources/firmware/Attribution.txt rename to resources/firmware/Attribution.txt diff --git a/Cura/resources/firmware/MarlinUltimaker-115200-dual.hex b/resources/firmware/MarlinUltimaker-115200-dual.hex similarity index 100% rename from Cura/resources/firmware/MarlinUltimaker-115200-dual.hex rename to resources/firmware/MarlinUltimaker-115200-dual.hex diff --git a/Cura/resources/firmware/MarlinUltimaker-115200.hex b/resources/firmware/MarlinUltimaker-115200.hex similarity index 100% rename from Cura/resources/firmware/MarlinUltimaker-115200.hex rename to resources/firmware/MarlinUltimaker-115200.hex diff --git a/Cura/resources/firmware/MarlinUltimaker-250000-dual.hex b/resources/firmware/MarlinUltimaker-250000-dual.hex similarity index 100% rename from Cura/resources/firmware/MarlinUltimaker-250000-dual.hex rename to resources/firmware/MarlinUltimaker-250000-dual.hex diff --git a/Cura/resources/firmware/MarlinUltimaker-250000.hex b/resources/firmware/MarlinUltimaker-250000.hex similarity index 100% rename from Cura/resources/firmware/MarlinUltimaker-250000.hex rename to resources/firmware/MarlinUltimaker-250000.hex diff --git a/Cura/resources/firmware/MarlinUltimaker-COPYING b/resources/firmware/MarlinUltimaker-COPYING similarity index 100% rename from Cura/resources/firmware/MarlinUltimaker-COPYING rename to resources/firmware/MarlinUltimaker-COPYING diff --git a/Cura/resources/firmware/MarlinUltimaker2.hex b/resources/firmware/MarlinUltimaker2.hex similarity index 100% rename from Cura/resources/firmware/MarlinUltimaker2.hex rename to resources/firmware/MarlinUltimaker2.hex diff --git a/Cura/resources/images/Ultimaker2backplate.png b/resources/images/Ultimaker2backplate.png similarity index 100% rename from Cura/resources/images/Ultimaker2backplate.png rename to resources/images/Ultimaker2backplate.png diff --git a/Cura/resources/images/UltimakerRobot.png b/resources/images/UltimakerRobot.png similarity index 100% rename from Cura/resources/images/UltimakerRobot.png rename to resources/images/UltimakerRobot.png diff --git a/Cura/resources/images/attention.png b/resources/images/attention.png similarity index 100% rename from Cura/resources/images/attention.png rename to resources/images/attention.png diff --git a/Cura/resources/images/busy-0.png b/resources/images/busy-0.png similarity index 100% rename from Cura/resources/images/busy-0.png rename to resources/images/busy-0.png diff --git a/Cura/resources/images/busy-1.png b/resources/images/busy-1.png similarity index 100% rename from Cura/resources/images/busy-1.png rename to resources/images/busy-1.png diff --git a/Cura/resources/images/busy-2.png b/resources/images/busy-2.png similarity index 100% rename from Cura/resources/images/busy-2.png rename to resources/images/busy-2.png diff --git a/Cura/resources/images/busy-3.png b/resources/images/busy-3.png similarity index 100% rename from Cura/resources/images/busy-3.png rename to resources/images/busy-3.png diff --git a/Cura/resources/images/c.png b/resources/images/c.png similarity index 100% rename from Cura/resources/images/c.png rename to resources/images/c.png diff --git a/Cura/resources/images/checkerboard.png b/resources/images/checkerboard.png similarity index 100% rename from Cura/resources/images/checkerboard.png rename to resources/images/checkerboard.png diff --git a/Cura/resources/images/checkmark.png b/resources/images/checkmark.png similarity index 100% rename from Cura/resources/images/checkmark.png rename to resources/images/checkmark.png diff --git a/Cura/resources/images/cross.png b/resources/images/cross.png similarity index 100% rename from Cura/resources/images/cross.png rename to resources/images/cross.png diff --git a/Cura/resources/images/cura-overlay.png b/resources/images/cura-overlay.png similarity index 100% rename from Cura/resources/images/cura-overlay.png rename to resources/images/cura-overlay.png diff --git a/Cura/resources/images/endstop_none.png b/resources/images/endstop_none.png similarity index 100% rename from Cura/resources/images/endstop_none.png rename to resources/images/endstop_none.png diff --git a/Cura/resources/images/endstop_xmax.png b/resources/images/endstop_xmax.png similarity index 100% rename from Cura/resources/images/endstop_xmax.png rename to resources/images/endstop_xmax.png diff --git a/Cura/resources/images/endstop_xmin.png b/resources/images/endstop_xmin.png similarity index 100% rename from Cura/resources/images/endstop_xmin.png rename to resources/images/endstop_xmin.png diff --git a/Cura/resources/images/endstop_ymax.png b/resources/images/endstop_ymax.png similarity index 100% rename from Cura/resources/images/endstop_ymax.png rename to resources/images/endstop_ymax.png diff --git a/Cura/resources/images/endstop_ymin.png b/resources/images/endstop_ymin.png similarity index 100% rename from Cura/resources/images/endstop_ymin.png rename to resources/images/endstop_ymin.png diff --git a/Cura/resources/images/endstop_zmax.png b/resources/images/endstop_zmax.png similarity index 100% rename from Cura/resources/images/endstop_zmax.png rename to resources/images/endstop_zmax.png diff --git a/Cura/resources/images/endstop_zmin.png b/resources/images/endstop_zmin.png similarity index 100% rename from Cura/resources/images/endstop_zmin.png rename to resources/images/endstop_zmin.png diff --git a/Cura/resources/images/error.png b/resources/images/error.png similarity index 100% rename from Cura/resources/images/error.png rename to resources/images/error.png diff --git a/Cura/resources/images/exit.png b/resources/images/exit.png similarity index 100% rename from Cura/resources/images/exit.png rename to resources/images/exit.png diff --git a/Cura/resources/images/extrude.png b/resources/images/extrude.png similarity index 100% rename from Cura/resources/images/extrude.png rename to resources/images/extrude.png diff --git a/Cura/resources/images/glButtons.png b/resources/images/glButtons.png similarity index 100% rename from Cura/resources/images/glButtons.png rename to resources/images/glButtons.png diff --git a/Cura/resources/images/print-move-home.png b/resources/images/print-move-home.png similarity index 100% rename from Cura/resources/images/print-move-home.png rename to resources/images/print-move-home.png diff --git a/Cura/resources/images/print-move-x-1.png b/resources/images/print-move-x-1.png similarity index 100% rename from Cura/resources/images/print-move-x-1.png rename to resources/images/print-move-x-1.png diff --git a/Cura/resources/images/print-move-x-10.png b/resources/images/print-move-x-10.png similarity index 100% rename from Cura/resources/images/print-move-x-10.png rename to resources/images/print-move-x-10.png diff --git a/Cura/resources/images/print-move-x-100.png b/resources/images/print-move-x-100.png similarity index 100% rename from Cura/resources/images/print-move-x-100.png rename to resources/images/print-move-x-100.png diff --git a/Cura/resources/images/print-move-x1.png b/resources/images/print-move-x1.png similarity index 100% rename from Cura/resources/images/print-move-x1.png rename to resources/images/print-move-x1.png diff --git a/Cura/resources/images/print-move-x10.png b/resources/images/print-move-x10.png similarity index 100% rename from Cura/resources/images/print-move-x10.png rename to resources/images/print-move-x10.png diff --git a/Cura/resources/images/print-move-x100.png b/resources/images/print-move-x100.png similarity index 100% rename from Cura/resources/images/print-move-x100.png rename to resources/images/print-move-x100.png diff --git a/Cura/resources/images/print-move-y-1.png b/resources/images/print-move-y-1.png similarity index 100% rename from Cura/resources/images/print-move-y-1.png rename to resources/images/print-move-y-1.png diff --git a/Cura/resources/images/print-move-y-10.png b/resources/images/print-move-y-10.png similarity index 100% rename from Cura/resources/images/print-move-y-10.png rename to resources/images/print-move-y-10.png diff --git a/Cura/resources/images/print-move-y-100.png b/resources/images/print-move-y-100.png similarity index 100% rename from Cura/resources/images/print-move-y-100.png rename to resources/images/print-move-y-100.png diff --git a/Cura/resources/images/print-move-y1.png b/resources/images/print-move-y1.png similarity index 100% rename from Cura/resources/images/print-move-y1.png rename to resources/images/print-move-y1.png diff --git a/Cura/resources/images/print-move-y10.png b/resources/images/print-move-y10.png similarity index 100% rename from Cura/resources/images/print-move-y10.png rename to resources/images/print-move-y10.png diff --git a/Cura/resources/images/print-move-y100.png b/resources/images/print-move-y100.png similarity index 100% rename from Cura/resources/images/print-move-y100.png rename to resources/images/print-move-y100.png diff --git a/Cura/resources/images/print-move-z-0.1.png b/resources/images/print-move-z-0.1.png similarity index 100% rename from Cura/resources/images/print-move-z-0.1.png rename to resources/images/print-move-z-0.1.png diff --git a/Cura/resources/images/print-move-z-1.png b/resources/images/print-move-z-1.png similarity index 100% rename from Cura/resources/images/print-move-z-1.png rename to resources/images/print-move-z-1.png diff --git a/Cura/resources/images/print-move-z-10.png b/resources/images/print-move-z-10.png similarity index 100% rename from Cura/resources/images/print-move-z-10.png rename to resources/images/print-move-z-10.png diff --git a/Cura/resources/images/print-move-z0.1.png b/resources/images/print-move-z0.1.png similarity index 100% rename from Cura/resources/images/print-move-z0.1.png rename to resources/images/print-move-z0.1.png diff --git a/Cura/resources/images/print-move-z1.png b/resources/images/print-move-z1.png similarity index 100% rename from Cura/resources/images/print-move-z1.png rename to resources/images/print-move-z1.png diff --git a/Cura/resources/images/print-move-z10.png b/resources/images/print-move-z10.png similarity index 100% rename from Cura/resources/images/print-move-z10.png rename to resources/images/print-move-z10.png diff --git a/Cura/resources/images/question.png b/resources/images/question.png similarity index 100% rename from Cura/resources/images/question.png rename to resources/images/question.png diff --git a/Cura/resources/images/ready.png b/resources/images/ready.png similarity index 100% rename from Cura/resources/images/ready.png rename to resources/images/ready.png diff --git a/Cura/resources/images/retract.png b/resources/images/retract.png similarity index 100% rename from Cura/resources/images/retract.png rename to resources/images/retract.png diff --git a/Cura/resources/images/splash.png b/resources/images/splash.png similarity index 100% rename from Cura/resources/images/splash.png rename to resources/images/splash.png diff --git a/Cura/resources/images/ultimaker-overlay.png b/resources/images/ultimaker-overlay.png similarity index 100% rename from Cura/resources/images/ultimaker-overlay.png rename to resources/images/ultimaker-overlay.png diff --git a/Cura/resources/images/youmagine-text.png b/resources/images/youmagine-text.png similarity index 100% rename from Cura/resources/images/youmagine-text.png rename to resources/images/youmagine-text.png diff --git a/Cura/resources/locale/Cura.in b/resources/locale/Cura.in similarity index 100% rename from Cura/resources/locale/Cura.in rename to resources/locale/Cura.in diff --git a/Cura/resources/locale/Cura.pot b/resources/locale/Cura.pot similarity index 100% rename from Cura/resources/locale/Cura.pot rename to resources/locale/Cura.pot diff --git a/Cura/resources/locale/de/LC_MESSAGES/Cura.mo b/resources/locale/de/LC_MESSAGES/Cura.mo similarity index 100% rename from Cura/resources/locale/de/LC_MESSAGES/Cura.mo rename to resources/locale/de/LC_MESSAGES/Cura.mo diff --git a/Cura/resources/locale/de/LC_MESSAGES/Cura.po b/resources/locale/de/LC_MESSAGES/Cura.po similarity index 100% rename from Cura/resources/locale/de/LC_MESSAGES/Cura.po rename to resources/locale/de/LC_MESSAGES/Cura.po diff --git a/Cura/resources/locale/en/LC_MESSAGES/Cura.mo b/resources/locale/en/LC_MESSAGES/Cura.mo similarity index 100% rename from Cura/resources/locale/en/LC_MESSAGES/Cura.mo rename to resources/locale/en/LC_MESSAGES/Cura.mo diff --git a/Cura/resources/locale/en/LC_MESSAGES/Cura.po b/resources/locale/en/LC_MESSAGES/Cura.po similarity index 100% rename from Cura/resources/locale/en/LC_MESSAGES/Cura.po rename to resources/locale/en/LC_MESSAGES/Cura.po diff --git a/Cura/resources/locale/fr/LC_MESSAGES/Cura.mo b/resources/locale/fr/LC_MESSAGES/Cura.mo similarity index 100% rename from Cura/resources/locale/fr/LC_MESSAGES/Cura.mo rename to resources/locale/fr/LC_MESSAGES/Cura.mo diff --git a/Cura/resources/locale/fr/LC_MESSAGES/Cura.po b/resources/locale/fr/LC_MESSAGES/Cura.po similarity index 100% rename from Cura/resources/locale/fr/LC_MESSAGES/Cura.po rename to resources/locale/fr/LC_MESSAGES/Cura.po diff --git a/Cura/resources/locale/nl/LC_MESSAGES/Cura.mo b/resources/locale/nl/LC_MESSAGES/Cura.mo similarity index 100% rename from Cura/resources/locale/nl/LC_MESSAGES/Cura.mo rename to resources/locale/nl/LC_MESSAGES/Cura.mo diff --git a/Cura/resources/locale/nl/LC_MESSAGES/Cura.po b/resources/locale/nl/LC_MESSAGES/Cura.po similarity index 100% rename from Cura/resources/locale/nl/LC_MESSAGES/Cura.po rename to resources/locale/nl/LC_MESSAGES/Cura.po diff --git a/Cura/resources/locale/po/LC_MESSAGES/Cura.mo b/resources/locale/po/LC_MESSAGES/Cura.mo similarity index 100% rename from Cura/resources/locale/po/LC_MESSAGES/Cura.mo rename to resources/locale/po/LC_MESSAGES/Cura.mo diff --git a/Cura/resources/locale/po/LC_MESSAGES/Cura.po b/resources/locale/po/LC_MESSAGES/Cura.po similarity index 100% rename from Cura/resources/locale/po/LC_MESSAGES/Cura.po rename to resources/locale/po/LC_MESSAGES/Cura.po diff --git a/Cura/resources/locale/ru/LC_MESSAGES/Cura.mo b/resources/locale/ru/LC_MESSAGES/Cura.mo similarity index 100% rename from Cura/resources/locale/ru/LC_MESSAGES/Cura.mo rename to resources/locale/ru/LC_MESSAGES/Cura.mo diff --git a/Cura/resources/locale/ru/LC_MESSAGES/Cura.po b/resources/locale/ru/LC_MESSAGES/Cura.po similarity index 100% rename from Cura/resources/locale/ru/LC_MESSAGES/Cura.po rename to resources/locale/ru/LC_MESSAGES/Cura.po diff --git a/Cura/resources/locale/sp/LC_MESSAGES/Cura.mo b/resources/locale/sp/LC_MESSAGES/Cura.mo similarity index 100% rename from Cura/resources/locale/sp/LC_MESSAGES/Cura.mo rename to resources/locale/sp/LC_MESSAGES/Cura.mo diff --git a/Cura/resources/locale/sp/LC_MESSAGES/Cura.po b/resources/locale/sp/LC_MESSAGES/Cura.po similarity index 100% rename from Cura/resources/locale/sp/LC_MESSAGES/Cura.po rename to resources/locale/sp/LC_MESSAGES/Cura.po diff --git a/Cura/resources/machine_profiles/MakerBotReplicator.ini b/resources/machine_profiles/MakerBotReplicator.ini similarity index 100% rename from Cura/resources/machine_profiles/MakerBotReplicator.ini rename to resources/machine_profiles/MakerBotReplicator.ini diff --git a/Cura/resources/machine_profiles/Mendel.ini b/resources/machine_profiles/Mendel.ini similarity index 100% rename from Cura/resources/machine_profiles/Mendel.ini rename to resources/machine_profiles/Mendel.ini diff --git a/Cura/resources/machine_profiles/PrintrBot.ini b/resources/machine_profiles/PrintrBot.ini similarity index 100% rename from Cura/resources/machine_profiles/PrintrBot.ini rename to resources/machine_profiles/PrintrBot.ini diff --git a/Cura/resources/machine_profiles/PrintrBotLC+.ini b/resources/machine_profiles/PrintrBotLC+.ini similarity index 100% rename from Cura/resources/machine_profiles/PrintrBotLC+.ini rename to resources/machine_profiles/PrintrBotLC+.ini diff --git a/Cura/resources/machine_profiles/Prusa Mendel i3.ini b/resources/machine_profiles/Prusa Mendel i3.ini similarity index 100% rename from Cura/resources/machine_profiles/Prusa Mendel i3.ini rename to resources/machine_profiles/Prusa Mendel i3.ini diff --git a/Cura/resources/meshes/Attribution.txt b/resources/meshes/Attribution.txt similarity index 100% rename from Cura/resources/meshes/Attribution.txt rename to resources/meshes/Attribution.txt diff --git a/Cura/resources/meshes/ultimaker2_platform.stl b/resources/meshes/ultimaker2_platform.stl similarity index 100% rename from Cura/resources/meshes/ultimaker2_platform.stl rename to resources/meshes/ultimaker2_platform.stl diff --git a/Cura/resources/meshes/ultimaker_platform.stl b/resources/meshes/ultimaker_platform.stl similarity index 100% rename from Cura/resources/meshes/ultimaker_platform.stl rename to resources/meshes/ultimaker_platform.stl diff --git a/Cura/resources/stl.ico b/resources/stl.ico similarity index 100% rename from Cura/resources/stl.ico rename to resources/stl.ico