From c12c427569d8516d063151df0ca09e25834de0c5 Mon Sep 17 00:00:00 2001 From: daid303 Date: Thu, 6 Dec 2012 18:17:14 +0100 Subject: [PATCH 1/2] Move resources in to their own subdirectory and update the code that uses the resources. --- Cura/gui/batchRun.py | 2 +- Cura/gui/configBase.py | 2 +- Cura/gui/firmwareInstall.py | 5 ++-- Cura/gui/mainWindow.py | 1 - Cura/{ => resources}/Cura.icns | Bin Cura/{ => resources}/cura.ico | Bin Cura/{ => resources}/example/Attribution.txt | 0 .../example/UltimakerHandle.stl | Bin .../example/UltimakerRobot_support.stl | Bin .../firmware/ultimaker_115200.h | 0 .../firmware/ultimaker_115200.hex | 0 .../firmware/ultimaker_250000.h | 0 .../firmware/ultimaker_250000.hex | 0 .../images/all-at-once-off.png | Bin .../{ => resources}/images/all-at-once-on.png | Bin Cura/{ => resources}/images/attention.png | Bin Cura/{ => resources}/images/autoplace.png | Bin Cura/{ => resources}/images/busy-0.png | Bin Cura/{ => resources}/images/busy-1.png | Bin Cura/{ => resources}/images/busy-2.png | Bin Cura/{ => resources}/images/busy-3.png | Bin Cura/{ => resources}/images/checkmark.png | Bin Cura/{ => resources}/images/copy.png | Bin Cura/{ => resources}/images/cross.png | Bin Cura/{ => resources}/images/cura-overlay.png | Bin Cura/{ => resources}/images/cut-mesh.png | Bin Cura/{ => resources}/images/endstop_none.png | Bin Cura/{ => resources}/images/endstop_xmax.png | Bin Cura/{ => resources}/images/endstop_xmin.png | Bin Cura/{ => resources}/images/endstop_ymax.png | Bin Cura/{ => resources}/images/endstop_ymin.png | Bin Cura/{ => resources}/images/endstop_zmax.png | Bin Cura/{ => resources}/images/endstop_zmin.png | Bin Cura/{ => resources}/images/error.png | Bin Cura/{ => resources}/images/exit.png | Bin Cura/{ => resources}/images/extrude.png | Bin Cura/{ => resources}/images/move-down.png | Bin Cura/{ => resources}/images/move-up.png | Bin Cura/{ => resources}/images/object-3d-off.png | Bin Cura/{ => resources}/images/object-3d-on.png | Bin Cura/{ => resources}/images/object-add.png | Bin .../images/object-max-size.png | Bin .../images/object-mirror-x-off.png | Bin .../images/object-mirror-x-on.png | Bin .../images/object-mirror-y-off.png | Bin .../images/object-mirror-y-on.png | Bin .../images/object-mirror-z-off.png | Bin .../images/object-mirror-z-on.png | Bin .../images/object-mul-x-add.png | Bin .../images/object-mul-x-sub.png | Bin .../images/object-mul-y-add.png | Bin .../images/object-mul-y-sub.png | Bin Cura/{ => resources}/images/object-remove.png | Bin Cura/{ => resources}/images/object-rotate.png | Bin Cura/{ => resources}/images/object-scale.png | Bin .../images/object-swap-xz-off.png | Bin .../images/object-swap-xz-on.png | Bin .../images/object-swap-yz-off.png | Bin .../images/object-swap-yz-on.png | Bin .../{ => resources}/images/object-top-off.png | Bin Cura/{ => resources}/images/object-top-on.png | Bin Cura/{ => resources}/images/open.png | Bin Cura/{ => resources}/images/preferences.png | Bin .../images/print-move-home.png | Bin .../{ => resources}/images/print-move-x-1.png | Bin .../images/print-move-x-10.png | Bin .../images/print-move-x-100.png | Bin Cura/{ => resources}/images/print-move-x1.png | Bin .../{ => resources}/images/print-move-x10.png | Bin .../images/print-move-x100.png | Bin .../{ => resources}/images/print-move-y-1.png | Bin .../images/print-move-y-10.png | Bin .../images/print-move-y-100.png | Bin Cura/{ => resources}/images/print-move-y1.png | Bin .../{ => resources}/images/print-move-y10.png | Bin .../images/print-move-y100.png | Bin .../images/print-move-z-0.1.png | Bin .../{ => resources}/images/print-move-z-1.png | Bin .../images/print-move-z-10.png | Bin .../images/print-move-z0.1.png | Bin Cura/{ => resources}/images/print-move-z1.png | Bin .../{ => resources}/images/print-move-z10.png | Bin Cura/{ => resources}/images/question.png | Bin Cura/{ => resources}/images/ready.png | Bin Cura/{ => resources}/images/retract.png | Bin .../images/save-combination.png | Bin Cura/{ => resources}/images/save.png | Bin Cura/{ => resources}/images/set-profile.png | Bin Cura/{ => resources}/images/slice.png | Bin Cura/{ => resources}/images/splash.png | Bin .../images/steepOverhang-off.png | Bin .../images/steepOverhang-on.png | Bin .../images/ultimaker-overlay.png | Bin .../images/view-border-off.png | Bin .../{ => resources}/images/view-border-on.png | Bin .../{ => resources}/images/view-gcode-off.png | Bin Cura/{ => resources}/images/view-gcode-on.png | Bin .../{ => resources}/images/view-mixed-off.png | Bin Cura/{ => resources}/images/view-mixed-on.png | Bin .../images/view-normal-off.png | Bin .../{ => resources}/images/view-normal-on.png | Bin .../images/view-transparent-off.png | Bin .../images/view-transparent-on.png | Bin Cura/{ => resources}/images/view-xray-off.png | Bin Cura/{ => resources}/images/view-xray-on.png | Bin .../meshes}/ultimaker_platform.stl | Bin Cura/{ => resources}/stl.ico | Bin Cura/util/resources.py | 24 ++++++++---------- 108 files changed, 16 insertions(+), 18 deletions(-) rename Cura/{ => resources}/Cura.icns (100%) rename Cura/{ => resources}/cura.ico (100%) rename Cura/{ => resources}/example/Attribution.txt (100%) rename Cura/{ => resources}/example/UltimakerHandle.stl (100%) rename Cura/{ => resources}/example/UltimakerRobot_support.stl (100%) rename Cura/{ => resources}/firmware/ultimaker_115200.h (100%) rename Cura/{ => resources}/firmware/ultimaker_115200.hex (100%) rename Cura/{ => resources}/firmware/ultimaker_250000.h (100%) rename Cura/{ => resources}/firmware/ultimaker_250000.hex (100%) rename Cura/{ => resources}/images/all-at-once-off.png (100%) rename Cura/{ => resources}/images/all-at-once-on.png (100%) rename Cura/{ => resources}/images/attention.png (100%) rename Cura/{ => resources}/images/autoplace.png (100%) rename Cura/{ => resources}/images/busy-0.png (100%) rename Cura/{ => resources}/images/busy-1.png (100%) rename Cura/{ => resources}/images/busy-2.png (100%) rename Cura/{ => resources}/images/busy-3.png (100%) rename Cura/{ => resources}/images/checkmark.png (100%) rename Cura/{ => resources}/images/copy.png (100%) rename Cura/{ => resources}/images/cross.png (100%) rename Cura/{ => resources}/images/cura-overlay.png (100%) rename Cura/{ => resources}/images/cut-mesh.png (100%) rename Cura/{ => resources}/images/endstop_none.png (100%) rename Cura/{ => resources}/images/endstop_xmax.png (100%) rename Cura/{ => resources}/images/endstop_xmin.png (100%) rename Cura/{ => resources}/images/endstop_ymax.png (100%) rename Cura/{ => resources}/images/endstop_ymin.png (100%) rename Cura/{ => resources}/images/endstop_zmax.png (100%) rename Cura/{ => resources}/images/endstop_zmin.png (100%) rename Cura/{ => resources}/images/error.png (100%) rename Cura/{ => resources}/images/exit.png (100%) rename Cura/{ => resources}/images/extrude.png (100%) rename Cura/{ => resources}/images/move-down.png (100%) rename Cura/{ => resources}/images/move-up.png (100%) rename Cura/{ => resources}/images/object-3d-off.png (100%) rename Cura/{ => resources}/images/object-3d-on.png (100%) rename Cura/{ => resources}/images/object-add.png (100%) rename Cura/{ => resources}/images/object-max-size.png (100%) rename Cura/{ => resources}/images/object-mirror-x-off.png (100%) rename Cura/{ => resources}/images/object-mirror-x-on.png (100%) rename Cura/{ => resources}/images/object-mirror-y-off.png (100%) rename Cura/{ => resources}/images/object-mirror-y-on.png (100%) rename Cura/{ => resources}/images/object-mirror-z-off.png (100%) rename Cura/{ => resources}/images/object-mirror-z-on.png (100%) rename Cura/{ => resources}/images/object-mul-x-add.png (100%) rename Cura/{ => resources}/images/object-mul-x-sub.png (100%) rename Cura/{ => resources}/images/object-mul-y-add.png (100%) rename Cura/{ => resources}/images/object-mul-y-sub.png (100%) rename Cura/{ => resources}/images/object-remove.png (100%) rename Cura/{ => resources}/images/object-rotate.png (100%) rename Cura/{ => resources}/images/object-scale.png (100%) rename Cura/{ => resources}/images/object-swap-xz-off.png (100%) rename Cura/{ => resources}/images/object-swap-xz-on.png (100%) rename Cura/{ => resources}/images/object-swap-yz-off.png (100%) rename Cura/{ => resources}/images/object-swap-yz-on.png (100%) rename Cura/{ => resources}/images/object-top-off.png (100%) rename Cura/{ => resources}/images/object-top-on.png (100%) rename Cura/{ => resources}/images/open.png (100%) rename Cura/{ => resources}/images/preferences.png (100%) rename Cura/{ => resources}/images/print-move-home.png (100%) rename Cura/{ => resources}/images/print-move-x-1.png (100%) rename Cura/{ => resources}/images/print-move-x-10.png (100%) rename Cura/{ => resources}/images/print-move-x-100.png (100%) rename Cura/{ => resources}/images/print-move-x1.png (100%) rename Cura/{ => resources}/images/print-move-x10.png (100%) rename Cura/{ => resources}/images/print-move-x100.png (100%) rename Cura/{ => resources}/images/print-move-y-1.png (100%) rename Cura/{ => resources}/images/print-move-y-10.png (100%) rename Cura/{ => resources}/images/print-move-y-100.png (100%) rename Cura/{ => resources}/images/print-move-y1.png (100%) rename Cura/{ => resources}/images/print-move-y10.png (100%) rename Cura/{ => resources}/images/print-move-y100.png (100%) rename Cura/{ => resources}/images/print-move-z-0.1.png (100%) rename Cura/{ => resources}/images/print-move-z-1.png (100%) rename Cura/{ => resources}/images/print-move-z-10.png (100%) rename Cura/{ => resources}/images/print-move-z0.1.png (100%) rename Cura/{ => resources}/images/print-move-z1.png (100%) rename Cura/{ => resources}/images/print-move-z10.png (100%) rename Cura/{ => resources}/images/question.png (100%) rename Cura/{ => resources}/images/ready.png (100%) rename Cura/{ => resources}/images/retract.png (100%) rename Cura/{ => resources}/images/save-combination.png (100%) rename Cura/{ => resources}/images/save.png (100%) rename Cura/{ => resources}/images/set-profile.png (100%) rename Cura/{ => resources}/images/slice.png (100%) rename Cura/{ => resources}/images/splash.png (100%) rename Cura/{ => resources}/images/steepOverhang-off.png (100%) rename Cura/{ => resources}/images/steepOverhang-on.png (100%) rename Cura/{ => resources}/images/ultimaker-overlay.png (100%) rename Cura/{ => resources}/images/view-border-off.png (100%) rename Cura/{ => resources}/images/view-border-on.png (100%) rename Cura/{ => resources}/images/view-gcode-off.png (100%) rename Cura/{ => resources}/images/view-gcode-on.png (100%) rename Cura/{ => resources}/images/view-mixed-off.png (100%) rename Cura/{ => resources}/images/view-mixed-on.png (100%) rename Cura/{ => resources}/images/view-normal-off.png (100%) rename Cura/{ => resources}/images/view-normal-on.png (100%) rename Cura/{ => resources}/images/view-transparent-off.png (100%) rename Cura/{ => resources}/images/view-transparent-on.png (100%) rename Cura/{ => resources}/images/view-xray-off.png (100%) rename Cura/{ => resources}/images/view-xray-on.png (100%) rename Cura/{images => resources/meshes}/ultimaker_platform.stl (100%) rename Cura/{ => resources}/stl.ico (100%) diff --git a/Cura/gui/batchRun.py b/Cura/gui/batchRun.py index 91e6c56..003e40d 100644 --- a/Cura/gui/batchRun.py +++ b/Cura/gui/batchRun.py @@ -1,6 +1,6 @@ from __future__ import absolute_import -import wx, os, platform, types, webbrowser, math, subprocess, multiprocessing, threading, time, re, shutil +import wx, os, multiprocessing, threading, time, shutil from Cura.util import profile from Cura.util import sliceRun diff --git a/Cura/gui/configBase.py b/Cura/gui/configBase.py index 653a2b6..f6c6884 100644 --- a/Cura/gui/configBase.py +++ b/Cura/gui/configBase.py @@ -1,6 +1,6 @@ from __future__ import absolute_import -import wx, wx.lib.stattext, os, sys, platform, types +import wx, wx.lib.stattext, types from Cura.util import validators from Cura.util import profile diff --git a/Cura/gui/firmwareInstall.py b/Cura/gui/firmwareInstall.py index c9d086b..efb791a 100644 --- a/Cura/gui/firmwareInstall.py +++ b/Cura/gui/firmwareInstall.py @@ -8,13 +8,14 @@ from Cura.avr_isp import intelHex from Cura.util import machineCom from Cura.util import profile +from Cura.util import resources def getDefaultFirmware(): if profile.getPreference('machine_type') == 'ultimaker': if sys.platform.startswith('linux'): - return os.path.join(os.path.dirname(os.path.abspath(__file__)), "../firmware/ultimaker_115200.hex") + return resources.getPathForFirmware("ultimaker_115200.hex") else: - return os.path.join(os.path.dirname(os.path.abspath(__file__)), "../firmware/ultimaker_250000.hex") + return resources.getPathForFirmware("ultimaker_250000.hex") return None class InstallFirmware(wx.Dialog): diff --git a/Cura/gui/mainWindow.py b/Cura/gui/mainWindow.py index e606ef5..9eba316 100644 --- a/Cura/gui/mainWindow.py +++ b/Cura/gui/mainWindow.py @@ -21,7 +21,6 @@ from Cura.gui import simpleMode from Cura.gui import projectPlanner from Cura.gui import batchRun from Cura.gui import flatSlicerWindow -from Cura.gui import icon from Cura.gui import dropTarget from Cura.util import validators from Cura.util import profile diff --git a/Cura/Cura.icns b/Cura/resources/Cura.icns similarity index 100% rename from Cura/Cura.icns rename to Cura/resources/Cura.icns diff --git a/Cura/cura.ico b/Cura/resources/cura.ico similarity index 100% rename from Cura/cura.ico rename to Cura/resources/cura.ico diff --git a/Cura/example/Attribution.txt b/Cura/resources/example/Attribution.txt similarity index 100% rename from Cura/example/Attribution.txt rename to Cura/resources/example/Attribution.txt diff --git a/Cura/example/UltimakerHandle.stl b/Cura/resources/example/UltimakerHandle.stl similarity index 100% rename from Cura/example/UltimakerHandle.stl rename to Cura/resources/example/UltimakerHandle.stl diff --git a/Cura/example/UltimakerRobot_support.stl b/Cura/resources/example/UltimakerRobot_support.stl similarity index 100% rename from Cura/example/UltimakerRobot_support.stl rename to Cura/resources/example/UltimakerRobot_support.stl diff --git a/Cura/firmware/ultimaker_115200.h b/Cura/resources/firmware/ultimaker_115200.h similarity index 100% rename from Cura/firmware/ultimaker_115200.h rename to Cura/resources/firmware/ultimaker_115200.h diff --git a/Cura/firmware/ultimaker_115200.hex b/Cura/resources/firmware/ultimaker_115200.hex similarity index 100% rename from Cura/firmware/ultimaker_115200.hex rename to Cura/resources/firmware/ultimaker_115200.hex diff --git a/Cura/firmware/ultimaker_250000.h b/Cura/resources/firmware/ultimaker_250000.h similarity index 100% rename from Cura/firmware/ultimaker_250000.h rename to Cura/resources/firmware/ultimaker_250000.h diff --git a/Cura/firmware/ultimaker_250000.hex b/Cura/resources/firmware/ultimaker_250000.hex similarity index 100% rename from Cura/firmware/ultimaker_250000.hex rename to Cura/resources/firmware/ultimaker_250000.hex diff --git a/Cura/images/all-at-once-off.png b/Cura/resources/images/all-at-once-off.png similarity index 100% rename from Cura/images/all-at-once-off.png rename to Cura/resources/images/all-at-once-off.png diff --git a/Cura/images/all-at-once-on.png b/Cura/resources/images/all-at-once-on.png similarity index 100% rename from Cura/images/all-at-once-on.png rename to Cura/resources/images/all-at-once-on.png diff --git a/Cura/images/attention.png b/Cura/resources/images/attention.png similarity index 100% rename from Cura/images/attention.png rename to Cura/resources/images/attention.png diff --git a/Cura/images/autoplace.png b/Cura/resources/images/autoplace.png similarity index 100% rename from Cura/images/autoplace.png rename to Cura/resources/images/autoplace.png diff --git a/Cura/images/busy-0.png b/Cura/resources/images/busy-0.png similarity index 100% rename from Cura/images/busy-0.png rename to Cura/resources/images/busy-0.png diff --git a/Cura/images/busy-1.png b/Cura/resources/images/busy-1.png similarity index 100% rename from Cura/images/busy-1.png rename to Cura/resources/images/busy-1.png diff --git a/Cura/images/busy-2.png b/Cura/resources/images/busy-2.png similarity index 100% rename from Cura/images/busy-2.png rename to Cura/resources/images/busy-2.png diff --git a/Cura/images/busy-3.png b/Cura/resources/images/busy-3.png similarity index 100% rename from Cura/images/busy-3.png rename to Cura/resources/images/busy-3.png diff --git a/Cura/images/checkmark.png b/Cura/resources/images/checkmark.png similarity index 100% rename from Cura/images/checkmark.png rename to Cura/resources/images/checkmark.png diff --git a/Cura/images/copy.png b/Cura/resources/images/copy.png similarity index 100% rename from Cura/images/copy.png rename to Cura/resources/images/copy.png diff --git a/Cura/images/cross.png b/Cura/resources/images/cross.png similarity index 100% rename from Cura/images/cross.png rename to Cura/resources/images/cross.png diff --git a/Cura/images/cura-overlay.png b/Cura/resources/images/cura-overlay.png similarity index 100% rename from Cura/images/cura-overlay.png rename to Cura/resources/images/cura-overlay.png diff --git a/Cura/images/cut-mesh.png b/Cura/resources/images/cut-mesh.png similarity index 100% rename from Cura/images/cut-mesh.png rename to Cura/resources/images/cut-mesh.png diff --git a/Cura/images/endstop_none.png b/Cura/resources/images/endstop_none.png similarity index 100% rename from Cura/images/endstop_none.png rename to Cura/resources/images/endstop_none.png diff --git a/Cura/images/endstop_xmax.png b/Cura/resources/images/endstop_xmax.png similarity index 100% rename from Cura/images/endstop_xmax.png rename to Cura/resources/images/endstop_xmax.png diff --git a/Cura/images/endstop_xmin.png b/Cura/resources/images/endstop_xmin.png similarity index 100% rename from Cura/images/endstop_xmin.png rename to Cura/resources/images/endstop_xmin.png diff --git a/Cura/images/endstop_ymax.png b/Cura/resources/images/endstop_ymax.png similarity index 100% rename from Cura/images/endstop_ymax.png rename to Cura/resources/images/endstop_ymax.png diff --git a/Cura/images/endstop_ymin.png b/Cura/resources/images/endstop_ymin.png similarity index 100% rename from Cura/images/endstop_ymin.png rename to Cura/resources/images/endstop_ymin.png diff --git a/Cura/images/endstop_zmax.png b/Cura/resources/images/endstop_zmax.png similarity index 100% rename from Cura/images/endstop_zmax.png rename to Cura/resources/images/endstop_zmax.png diff --git a/Cura/images/endstop_zmin.png b/Cura/resources/images/endstop_zmin.png similarity index 100% rename from Cura/images/endstop_zmin.png rename to Cura/resources/images/endstop_zmin.png diff --git a/Cura/images/error.png b/Cura/resources/images/error.png similarity index 100% rename from Cura/images/error.png rename to Cura/resources/images/error.png diff --git a/Cura/images/exit.png b/Cura/resources/images/exit.png similarity index 100% rename from Cura/images/exit.png rename to Cura/resources/images/exit.png diff --git a/Cura/images/extrude.png b/Cura/resources/images/extrude.png similarity index 100% rename from Cura/images/extrude.png rename to Cura/resources/images/extrude.png diff --git a/Cura/images/move-down.png b/Cura/resources/images/move-down.png similarity index 100% rename from Cura/images/move-down.png rename to Cura/resources/images/move-down.png diff --git a/Cura/images/move-up.png b/Cura/resources/images/move-up.png similarity index 100% rename from Cura/images/move-up.png rename to Cura/resources/images/move-up.png diff --git a/Cura/images/object-3d-off.png b/Cura/resources/images/object-3d-off.png similarity index 100% rename from Cura/images/object-3d-off.png rename to Cura/resources/images/object-3d-off.png diff --git a/Cura/images/object-3d-on.png b/Cura/resources/images/object-3d-on.png similarity index 100% rename from Cura/images/object-3d-on.png rename to Cura/resources/images/object-3d-on.png diff --git a/Cura/images/object-add.png b/Cura/resources/images/object-add.png similarity index 100% rename from Cura/images/object-add.png rename to Cura/resources/images/object-add.png diff --git a/Cura/images/object-max-size.png b/Cura/resources/images/object-max-size.png similarity index 100% rename from Cura/images/object-max-size.png rename to Cura/resources/images/object-max-size.png diff --git a/Cura/images/object-mirror-x-off.png b/Cura/resources/images/object-mirror-x-off.png similarity index 100% rename from Cura/images/object-mirror-x-off.png rename to Cura/resources/images/object-mirror-x-off.png diff --git a/Cura/images/object-mirror-x-on.png b/Cura/resources/images/object-mirror-x-on.png similarity index 100% rename from Cura/images/object-mirror-x-on.png rename to Cura/resources/images/object-mirror-x-on.png diff --git a/Cura/images/object-mirror-y-off.png b/Cura/resources/images/object-mirror-y-off.png similarity index 100% rename from Cura/images/object-mirror-y-off.png rename to Cura/resources/images/object-mirror-y-off.png diff --git a/Cura/images/object-mirror-y-on.png b/Cura/resources/images/object-mirror-y-on.png similarity index 100% rename from Cura/images/object-mirror-y-on.png rename to Cura/resources/images/object-mirror-y-on.png diff --git a/Cura/images/object-mirror-z-off.png b/Cura/resources/images/object-mirror-z-off.png similarity index 100% rename from Cura/images/object-mirror-z-off.png rename to Cura/resources/images/object-mirror-z-off.png diff --git a/Cura/images/object-mirror-z-on.png b/Cura/resources/images/object-mirror-z-on.png similarity index 100% rename from Cura/images/object-mirror-z-on.png rename to Cura/resources/images/object-mirror-z-on.png diff --git a/Cura/images/object-mul-x-add.png b/Cura/resources/images/object-mul-x-add.png similarity index 100% rename from Cura/images/object-mul-x-add.png rename to Cura/resources/images/object-mul-x-add.png diff --git a/Cura/images/object-mul-x-sub.png b/Cura/resources/images/object-mul-x-sub.png similarity index 100% rename from Cura/images/object-mul-x-sub.png rename to Cura/resources/images/object-mul-x-sub.png diff --git a/Cura/images/object-mul-y-add.png b/Cura/resources/images/object-mul-y-add.png similarity index 100% rename from Cura/images/object-mul-y-add.png rename to Cura/resources/images/object-mul-y-add.png diff --git a/Cura/images/object-mul-y-sub.png b/Cura/resources/images/object-mul-y-sub.png similarity index 100% rename from Cura/images/object-mul-y-sub.png rename to Cura/resources/images/object-mul-y-sub.png diff --git a/Cura/images/object-remove.png b/Cura/resources/images/object-remove.png similarity index 100% rename from Cura/images/object-remove.png rename to Cura/resources/images/object-remove.png diff --git a/Cura/images/object-rotate.png b/Cura/resources/images/object-rotate.png similarity index 100% rename from Cura/images/object-rotate.png rename to Cura/resources/images/object-rotate.png diff --git a/Cura/images/object-scale.png b/Cura/resources/images/object-scale.png similarity index 100% rename from Cura/images/object-scale.png rename to Cura/resources/images/object-scale.png diff --git a/Cura/images/object-swap-xz-off.png b/Cura/resources/images/object-swap-xz-off.png similarity index 100% rename from Cura/images/object-swap-xz-off.png rename to Cura/resources/images/object-swap-xz-off.png diff --git a/Cura/images/object-swap-xz-on.png b/Cura/resources/images/object-swap-xz-on.png similarity index 100% rename from Cura/images/object-swap-xz-on.png rename to Cura/resources/images/object-swap-xz-on.png diff --git a/Cura/images/object-swap-yz-off.png b/Cura/resources/images/object-swap-yz-off.png similarity index 100% rename from Cura/images/object-swap-yz-off.png rename to Cura/resources/images/object-swap-yz-off.png diff --git a/Cura/images/object-swap-yz-on.png b/Cura/resources/images/object-swap-yz-on.png similarity index 100% rename from Cura/images/object-swap-yz-on.png rename to Cura/resources/images/object-swap-yz-on.png diff --git a/Cura/images/object-top-off.png b/Cura/resources/images/object-top-off.png similarity index 100% rename from Cura/images/object-top-off.png rename to Cura/resources/images/object-top-off.png diff --git a/Cura/images/object-top-on.png b/Cura/resources/images/object-top-on.png similarity index 100% rename from Cura/images/object-top-on.png rename to Cura/resources/images/object-top-on.png diff --git a/Cura/images/open.png b/Cura/resources/images/open.png similarity index 100% rename from Cura/images/open.png rename to Cura/resources/images/open.png diff --git a/Cura/images/preferences.png b/Cura/resources/images/preferences.png similarity index 100% rename from Cura/images/preferences.png rename to Cura/resources/images/preferences.png diff --git a/Cura/images/print-move-home.png b/Cura/resources/images/print-move-home.png similarity index 100% rename from Cura/images/print-move-home.png rename to Cura/resources/images/print-move-home.png diff --git a/Cura/images/print-move-x-1.png b/Cura/resources/images/print-move-x-1.png similarity index 100% rename from Cura/images/print-move-x-1.png rename to Cura/resources/images/print-move-x-1.png diff --git a/Cura/images/print-move-x-10.png b/Cura/resources/images/print-move-x-10.png similarity index 100% rename from Cura/images/print-move-x-10.png rename to Cura/resources/images/print-move-x-10.png diff --git a/Cura/images/print-move-x-100.png b/Cura/resources/images/print-move-x-100.png similarity index 100% rename from Cura/images/print-move-x-100.png rename to Cura/resources/images/print-move-x-100.png diff --git a/Cura/images/print-move-x1.png b/Cura/resources/images/print-move-x1.png similarity index 100% rename from Cura/images/print-move-x1.png rename to Cura/resources/images/print-move-x1.png diff --git a/Cura/images/print-move-x10.png b/Cura/resources/images/print-move-x10.png similarity index 100% rename from Cura/images/print-move-x10.png rename to Cura/resources/images/print-move-x10.png diff --git a/Cura/images/print-move-x100.png b/Cura/resources/images/print-move-x100.png similarity index 100% rename from Cura/images/print-move-x100.png rename to Cura/resources/images/print-move-x100.png diff --git a/Cura/images/print-move-y-1.png b/Cura/resources/images/print-move-y-1.png similarity index 100% rename from Cura/images/print-move-y-1.png rename to Cura/resources/images/print-move-y-1.png diff --git a/Cura/images/print-move-y-10.png b/Cura/resources/images/print-move-y-10.png similarity index 100% rename from Cura/images/print-move-y-10.png rename to Cura/resources/images/print-move-y-10.png diff --git a/Cura/images/print-move-y-100.png b/Cura/resources/images/print-move-y-100.png similarity index 100% rename from Cura/images/print-move-y-100.png rename to Cura/resources/images/print-move-y-100.png diff --git a/Cura/images/print-move-y1.png b/Cura/resources/images/print-move-y1.png similarity index 100% rename from Cura/images/print-move-y1.png rename to Cura/resources/images/print-move-y1.png diff --git a/Cura/images/print-move-y10.png b/Cura/resources/images/print-move-y10.png similarity index 100% rename from Cura/images/print-move-y10.png rename to Cura/resources/images/print-move-y10.png diff --git a/Cura/images/print-move-y100.png b/Cura/resources/images/print-move-y100.png similarity index 100% rename from Cura/images/print-move-y100.png rename to Cura/resources/images/print-move-y100.png diff --git a/Cura/images/print-move-z-0.1.png b/Cura/resources/images/print-move-z-0.1.png similarity index 100% rename from Cura/images/print-move-z-0.1.png rename to Cura/resources/images/print-move-z-0.1.png diff --git a/Cura/images/print-move-z-1.png b/Cura/resources/images/print-move-z-1.png similarity index 100% rename from Cura/images/print-move-z-1.png rename to Cura/resources/images/print-move-z-1.png diff --git a/Cura/images/print-move-z-10.png b/Cura/resources/images/print-move-z-10.png similarity index 100% rename from Cura/images/print-move-z-10.png rename to Cura/resources/images/print-move-z-10.png diff --git a/Cura/images/print-move-z0.1.png b/Cura/resources/images/print-move-z0.1.png similarity index 100% rename from Cura/images/print-move-z0.1.png rename to Cura/resources/images/print-move-z0.1.png diff --git a/Cura/images/print-move-z1.png b/Cura/resources/images/print-move-z1.png similarity index 100% rename from Cura/images/print-move-z1.png rename to Cura/resources/images/print-move-z1.png diff --git a/Cura/images/print-move-z10.png b/Cura/resources/images/print-move-z10.png similarity index 100% rename from Cura/images/print-move-z10.png rename to Cura/resources/images/print-move-z10.png diff --git a/Cura/images/question.png b/Cura/resources/images/question.png similarity index 100% rename from Cura/images/question.png rename to Cura/resources/images/question.png diff --git a/Cura/images/ready.png b/Cura/resources/images/ready.png similarity index 100% rename from Cura/images/ready.png rename to Cura/resources/images/ready.png diff --git a/Cura/images/retract.png b/Cura/resources/images/retract.png similarity index 100% rename from Cura/images/retract.png rename to Cura/resources/images/retract.png diff --git a/Cura/images/save-combination.png b/Cura/resources/images/save-combination.png similarity index 100% rename from Cura/images/save-combination.png rename to Cura/resources/images/save-combination.png diff --git a/Cura/images/save.png b/Cura/resources/images/save.png similarity index 100% rename from Cura/images/save.png rename to Cura/resources/images/save.png diff --git a/Cura/images/set-profile.png b/Cura/resources/images/set-profile.png similarity index 100% rename from Cura/images/set-profile.png rename to Cura/resources/images/set-profile.png diff --git a/Cura/images/slice.png b/Cura/resources/images/slice.png similarity index 100% rename from Cura/images/slice.png rename to Cura/resources/images/slice.png diff --git a/Cura/images/splash.png b/Cura/resources/images/splash.png similarity index 100% rename from Cura/images/splash.png rename to Cura/resources/images/splash.png diff --git a/Cura/images/steepOverhang-off.png b/Cura/resources/images/steepOverhang-off.png similarity index 100% rename from Cura/images/steepOverhang-off.png rename to Cura/resources/images/steepOverhang-off.png diff --git a/Cura/images/steepOverhang-on.png b/Cura/resources/images/steepOverhang-on.png similarity index 100% rename from Cura/images/steepOverhang-on.png rename to Cura/resources/images/steepOverhang-on.png diff --git a/Cura/images/ultimaker-overlay.png b/Cura/resources/images/ultimaker-overlay.png similarity index 100% rename from Cura/images/ultimaker-overlay.png rename to Cura/resources/images/ultimaker-overlay.png diff --git a/Cura/images/view-border-off.png b/Cura/resources/images/view-border-off.png similarity index 100% rename from Cura/images/view-border-off.png rename to Cura/resources/images/view-border-off.png diff --git a/Cura/images/view-border-on.png b/Cura/resources/images/view-border-on.png similarity index 100% rename from Cura/images/view-border-on.png rename to Cura/resources/images/view-border-on.png diff --git a/Cura/images/view-gcode-off.png b/Cura/resources/images/view-gcode-off.png similarity index 100% rename from Cura/images/view-gcode-off.png rename to Cura/resources/images/view-gcode-off.png diff --git a/Cura/images/view-gcode-on.png b/Cura/resources/images/view-gcode-on.png similarity index 100% rename from Cura/images/view-gcode-on.png rename to Cura/resources/images/view-gcode-on.png diff --git a/Cura/images/view-mixed-off.png b/Cura/resources/images/view-mixed-off.png similarity index 100% rename from Cura/images/view-mixed-off.png rename to Cura/resources/images/view-mixed-off.png diff --git a/Cura/images/view-mixed-on.png b/Cura/resources/images/view-mixed-on.png similarity index 100% rename from Cura/images/view-mixed-on.png rename to Cura/resources/images/view-mixed-on.png diff --git a/Cura/images/view-normal-off.png b/Cura/resources/images/view-normal-off.png similarity index 100% rename from Cura/images/view-normal-off.png rename to Cura/resources/images/view-normal-off.png diff --git a/Cura/images/view-normal-on.png b/Cura/resources/images/view-normal-on.png similarity index 100% rename from Cura/images/view-normal-on.png rename to Cura/resources/images/view-normal-on.png diff --git a/Cura/images/view-transparent-off.png b/Cura/resources/images/view-transparent-off.png similarity index 100% rename from Cura/images/view-transparent-off.png rename to Cura/resources/images/view-transparent-off.png diff --git a/Cura/images/view-transparent-on.png b/Cura/resources/images/view-transparent-on.png similarity index 100% rename from Cura/images/view-transparent-on.png rename to Cura/resources/images/view-transparent-on.png diff --git a/Cura/images/view-xray-off.png b/Cura/resources/images/view-xray-off.png similarity index 100% rename from Cura/images/view-xray-off.png rename to Cura/resources/images/view-xray-off.png diff --git a/Cura/images/view-xray-on.png b/Cura/resources/images/view-xray-on.png similarity index 100% rename from Cura/images/view-xray-on.png rename to Cura/resources/images/view-xray-on.png diff --git a/Cura/images/ultimaker_platform.stl b/Cura/resources/meshes/ultimaker_platform.stl similarity index 100% rename from Cura/images/ultimaker_platform.stl rename to Cura/resources/meshes/ultimaker_platform.stl diff --git a/Cura/stl.ico b/Cura/resources/stl.ico similarity index 100% rename from Cura/stl.ico rename to Cura/resources/stl.ico diff --git a/Cura/util/resources.py b/Cura/util/resources.py index 0db52c1..4eb6e37 100644 --- a/Cura/util/resources.py +++ b/Cura/util/resources.py @@ -9,28 +9,26 @@ __all__ = ['getPathForResource', 'getPathForImage', 'getPathForMesh'] if sys.platform.startswith('darwin'): if hasattr(sys, 'frozen'): from Foundation import * - imagesPath = os.path.join(NSBundle.mainBundle().resourcePath(), 'images') - meshesPath = os.path.join(NSBundle.mainBundle().resourcePath(), 'images') + resourceBasePath = NSBundle.mainBundle().resourcePath() else: - imagesPath = os.path.join(os.path.dirname(__file__), "../images") - meshesPath = os.path.join(os.path.dirname(__file__), "../images") + resourceBasePath = os.path.join(os.path.dirname(__file__), "../resources") else: if hasattr(sys, 'frozen'): - imagesPath = os.path.join(os.path.dirname(__file__), "../../images") - meshesPath = os.path.join(os.path.dirname(__file__), "../../images") + resourceBasePath = os.path.join(os.path.dirname(__file__), "../../resources") else: - imagesPath = os.path.join(os.path.dirname(__file__), "../images") - meshesPath = os.path.join(os.path.dirname(__file__), "../images") + resourceBasePath = os.path.join(os.path.dirname(__file__), "../resources") - -def getPathForResource(dir, resource_name): +def getPathForResource(dir, subdir, resource_name): assert os.path.isdir(dir), "{p} is not a directory".format(p=dir) - path = os.path.normpath(os.path.join(dir, resource_name)) + path = os.path.normpath(os.path.join(dir, subdir, resource_name)) assert os.path.isfile(path), "{p} is not a file.".format(p=path) return path def getPathForImage(name): - return getPathForResource(imagesPath, name) + return getPathForResource(resourceBasePath, 'images', name) def getPathForMesh(name): - return getPathForResource(meshesPath, name) + return getPathForResource(resourceBasePath, 'meshes', name) + +def getPathForFirmware(name): + return getPathForResource(resourceBasePath, 'firmware', name) From c7e497c1c8900f341631c2c94584cd951d0cd3b9 Mon Sep 17 00:00:00 2001 From: daid303 Date: Thu, 6 Dec 2012 18:28:37 +0100 Subject: [PATCH 2/2] Move some gui utility files into a seperate location so the code gets a bit more seperated. --- Cura/gui/alterationPanel.py | 2 +- Cura/gui/batchRun.py | 5 ++--- Cura/gui/flatSlicerWindow.py | 5 ++--- Cura/gui/icon.py | 27 --------------------------- Cura/gui/mainWindow.py | 3 +-- Cura/gui/preview3d.py | 4 ++-- Cura/gui/printWindow.py | 6 ++---- Cura/gui/projectPlanner.py | 11 +++++------ Cura/gui/simpleMode.py | 3 +-- Cura/gui/sliceProgessPanel.py | 2 +- Cura/gui/{ => util}/dropTarget.py | 0 Cura/gui/{ => util}/gcodeTextArea.py | 0 Cura/gui/{ => util}/opengl.py | 0 Cura/gui/{ => util}/taskbar.py | 0 Cura/gui/{ => util}/taskbarlib.tlb | Bin Cura/gui/{ => util}/toolbarUtil.py | 0 Cura/gui/{ => util}/webcam.py | 0 17 files changed, 17 insertions(+), 51 deletions(-) delete mode 100644 Cura/gui/icon.py rename Cura/gui/{ => util}/dropTarget.py (100%) rename Cura/gui/{ => util}/gcodeTextArea.py (100%) rename Cura/gui/{ => util}/opengl.py (100%) rename Cura/gui/{ => util}/taskbar.py (100%) rename Cura/gui/{ => util}/taskbarlib.tlb (100%) rename Cura/gui/{ => util}/toolbarUtil.py (100%) rename Cura/gui/{ => util}/webcam.py (100%) diff --git a/Cura/gui/alterationPanel.py b/Cura/gui/alterationPanel.py index e67b211..4646c51 100644 --- a/Cura/gui/alterationPanel.py +++ b/Cura/gui/alterationPanel.py @@ -2,7 +2,7 @@ from __future__ import absolute_import import wx, wx.stc -from Cura.gui import gcodeTextArea +from Cura.gui.util import gcodeTextArea from Cura.util import profile class alterationPanel(wx.Panel): diff --git a/Cura/gui/batchRun.py b/Cura/gui/batchRun.py index 003e40d..0b545d2 100644 --- a/Cura/gui/batchRun.py +++ b/Cura/gui/batchRun.py @@ -5,7 +5,7 @@ import wx, os, multiprocessing, threading, time, shutil from Cura.util import profile from Cura.util import sliceRun from Cura.util import meshLoader -from Cura.gui import dropTarget +from Cura.gui.util import dropTarget class batchRunWindow(wx.Frame): def __init__(self, parent): @@ -19,7 +19,6 @@ class batchRunWindow(wx.Frame): self.panel = wx.Panel(self, -1) self.SetSizer(wx.BoxSizer(wx.VERTICAL)) self.GetSizer().Add(self.panel, 1, flag=wx.EXPAND) - #self.SetIcon(icon.getMainIcon()) self.sizer = wx.GridBagSizer(2,2) self.panel.SetSizer(self.sizer) @@ -61,7 +60,7 @@ class batchRunWindow(wx.Frame): self._updateListbox() def OnRemModel(self, e): - if self.selection == None: + if self.selection is None: return self.list.remove(self.selection) self._updateListbox() diff --git a/Cura/gui/flatSlicerWindow.py b/Cura/gui/flatSlicerWindow.py index a5de99c..6a8c4cd 100644 --- a/Cura/gui/flatSlicerWindow.py +++ b/Cura/gui/flatSlicerWindow.py @@ -15,8 +15,8 @@ except: print "Failed to find PyOpenGL: http://pyopengl.sourceforge.net/" hasOpenGLlibs = False -from Cura.gui import toolbarUtil -from Cura.gui import opengl +from Cura.gui.util import toolbarUtil +from Cura.gui.util import opengl from Cura.util import util3d from Cura.util import svg from Cura.util import profile @@ -35,7 +35,6 @@ class flatSlicerWindow(wx.Frame): self.panel = wx.Panel(self, -1) self.SetSizer(wx.BoxSizer(wx.VERTICAL)) self.GetSizer().Add(self.panel, 1, flag=wx.EXPAND) - #self.SetIcon(icon.getMainIcon()) self.toolbar = toolbarUtil.Toolbar(self.panel) diff --git a/Cura/gui/icon.py b/Cura/gui/icon.py deleted file mode 100644 index 8b53bbf..0000000 --- a/Cura/gui/icon.py +++ /dev/null @@ -1,27 +0,0 @@ -#---------------------------------------------------------------------- -# This file was generated by /usr/bin/img2py -# -from wx.lib.embeddedimage import PyEmbeddedImage - -Main = PyEmbeddedImage( - "iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAIAAAD9MqGbAAAAA3NCSVQICAjb4U/gAAAC/klE" - "QVQ4jYWUe0hTYRTAz+5rd5uPys2Z89mtLLecPRQpZw+ishf0gB5EQRZFWY20h/6jGQWSlJRR" - "RFGRFJXRHw3ECpRWbqRZq1WabErqqjWd7XF3d7e72x8rfKX9/jsf349zzncOn6DyPRuPBeAv" - "IY5DUBT+hy2IY/FYII1g2s2mi5Vl7WZTMBhQZS5Qqefbf3w7UlIxeYp0PBkDgMYGXenhAo4L" - "yqcqUqiZpjfGVoMeAFat35yjWTau6f3lrCwrxgn8bNWNxcvzERRl/f4TB3e9ano2ccHYuxcN" - "A46fqzdsWbpybfiIEAr3aUsYH52mzJjAROVJVOdbo7bkdMiod+gbvZYv0Sq1NDZuLoK4Xzc7" - "W43ipBRMEjFK6+cwjKHdABDNsh9KtQAgmTY9cctO1vHTdOxA+FJMTi4ZGzc2JyJTpACAE8fy" - "6l8RUtmfgqWyvAajYuPWcEgHPf8wZ2drAODW1WoylUKFJAA0ftWteaTMb15SPutpbwIUWg4t" - "u5eyXadptj0f0WdBxWWht/+Z7vH929cyvF6cDzVh/k6nmZUwHpR5O0/gDnnykvKtvzp6XJa1" - "1LahPgHg8MlTU6SxN2rO9TNMyEc3XKojRaLIokludFD+nT+jqVZQqS55LhE1ffiGCe588qYR" - "DAAEPe6Wmirn9RoifY4sc0GpvNaHBo62ALIUEFQIJgGdHSNiB9Lnlien7elgSWRoshGRWYXF" - "8es2cV2Wzrs3AUDE4QCAmElKqc08cCUr4ziOitvbynieg/D2DZczL1xzuey2XjPeUeTjaNV5" - "HdgNLk833VuP4ZFCkdw9+ImhbYDPGGGG2f9ik9X5GUeJAMfWPslJFyvEfgcvQAR8aESaURrP" - "c3szTnzsbwMAkrbFdz1kAOwzd29WnxShoveGwj7rg9EvNBZbd52xrYKKW5RI7XA6Wn701A86" - "WhFUSCm1ePKGiUwA0Os03pdWUPMAEOL8jFgBACTdJ5tXLRj1J4yFcRh89qao6ASIWcH5He5A" - "lwRiBqIX/gbbS0S3wHAu3wAAAABJRU5ErkJggg==") -getMainData = Main.GetData -getMainImage = Main.GetImage -getMainBitmap = Main.GetBitmap -getMainIcon = Main.GetIcon - diff --git a/Cura/gui/mainWindow.py b/Cura/gui/mainWindow.py index 9eba316..af2bb74 100644 --- a/Cura/gui/mainWindow.py +++ b/Cura/gui/mainWindow.py @@ -21,7 +21,7 @@ from Cura.gui import simpleMode from Cura.gui import projectPlanner from Cura.gui import batchRun from Cura.gui import flatSlicerWindow -from Cura.gui import dropTarget +from Cura.gui.util import dropTarget from Cura.util import validators from Cura.util import profile from Cura.util import version @@ -57,7 +57,6 @@ class mainWindow(configBase.configWindowBase): extruderCount = int(profile.getPreference('extruder_amount')) wx.EVT_CLOSE(self, self.OnClose) - #self.SetIcon(icon.getMainIcon()) self.SetDropTarget(dropTarget.FileDropTarget(self.OnDropFiles, meshLoader.supportedExtensions())) diff --git a/Cura/gui/preview3d.py b/Cura/gui/preview3d.py index ddfa93e..4f2b489 100644 --- a/Cura/gui/preview3d.py +++ b/Cura/gui/preview3d.py @@ -20,8 +20,8 @@ except: print "Failed to find PyOpenGL: http://pyopengl.sourceforge.net/" hasOpenGLlibs = False -from Cura.gui import opengl -from Cura.gui import toolbarUtil +from Cura.gui.util import opengl +from Cura.gui.util import toolbarUtil from Cura.util import profile from Cura.util import gcodeInterpreter diff --git a/Cura/gui/printWindow.py b/Cura/gui/printWindow.py index 0482087..3a57bb4 100644 --- a/Cura/gui/printWindow.py +++ b/Cura/gui/printWindow.py @@ -11,8 +11,8 @@ import platform import wx from wx.lib import buttons -from Cura.gui import webcam -from Cura.gui import taskbar +from Cura.gui.util import webcam +from Cura.gui.util import taskbar from Cura.util import machineCom from Cura.util import gcodeInterpreter from Cura.util import power @@ -118,8 +118,6 @@ class printWindow(wx.Frame): if not self.cam.hasCamera(): self.cam = None - #self.SetIcon(icon.getMainIcon()) - self.SetSizer(wx.BoxSizer()) self.panel = wx.Panel(self) self.GetSizer().Add(self.panel, 1, flag=wx.EXPAND) diff --git a/Cura/gui/projectPlanner.py b/Cura/gui/projectPlanner.py index 32a2945..f35d65f 100644 --- a/Cura/gui/projectPlanner.py +++ b/Cura/gui/projectPlanner.py @@ -20,12 +20,12 @@ except: print "Failed to find PyOpenGL: http://pyopengl.sourceforge.net/" hasOpenGLlibs = False -from Cura.gui import opengl -from Cura.gui import toolbarUtil +from Cura.gui.util import opengl +from Cura.gui.util import toolbarUtil from Cura.gui import configBase from Cura.gui import printWindow -from Cura.gui import dropTarget -from Cura.gui import taskbar +from Cura.gui.util import dropTarget +from Cura.gui.util import taskbar from Cura.util import validators from Cura.util import profile from Cura.util import util3d @@ -149,8 +149,7 @@ class projectPlanner(wx.Frame): self.panel = wx.Panel(self, -1) self.SetSizer(wx.BoxSizer(wx.VERTICAL)) self.GetSizer().Add(self.panel, 1, flag=wx.EXPAND) - #self.SetIcon(icon.getMainIcon()) - + self.SetDropTarget(dropTarget.FileDropTarget(self.OnDropFiles, meshLoader.supportedExtensions())) self.list = [] diff --git a/Cura/gui/simpleMode.py b/Cura/gui/simpleMode.py index 87e63ca..d17c052 100644 --- a/Cura/gui/simpleMode.py +++ b/Cura/gui/simpleMode.py @@ -8,7 +8,7 @@ from Cura.gui import configBase from Cura.gui import preview3d from Cura.gui import sliceProgessPanel from Cura.gui import preferencesDialog -from Cura.gui import dropTarget +from Cura.gui.util import dropTarget from Cura.gui import printWindow from Cura.util import profile from Cura.util import version @@ -21,7 +21,6 @@ class simpleModeWindow(configBase.configWindowBase): super(simpleModeWindow, self).__init__(title='Cura - Quickprint - ' + version.getVersion()) wx.EVT_CLOSE(self, self.OnClose) - #self.SetIcon(icon.getMainIcon()) self.SetDropTarget(dropTarget.FileDropTarget(self.OnDropFiles, meshLoader.supportedExtensions())) diff --git a/Cura/gui/sliceProgessPanel.py b/Cura/gui/sliceProgessPanel.py index 091e444..5669534 100644 --- a/Cura/gui/sliceProgessPanel.py +++ b/Cura/gui/sliceProgessPanel.py @@ -8,8 +8,8 @@ import time import re import platform -from Cura.gui import taskbar from Cura.gui import preferencesDialog +from Cura.gui.util import taskbar from Cura.util import profile from Cura.util import sliceRun from Cura.util import exporer diff --git a/Cura/gui/dropTarget.py b/Cura/gui/util/dropTarget.py similarity index 100% rename from Cura/gui/dropTarget.py rename to Cura/gui/util/dropTarget.py diff --git a/Cura/gui/gcodeTextArea.py b/Cura/gui/util/gcodeTextArea.py similarity index 100% rename from Cura/gui/gcodeTextArea.py rename to Cura/gui/util/gcodeTextArea.py diff --git a/Cura/gui/opengl.py b/Cura/gui/util/opengl.py similarity index 100% rename from Cura/gui/opengl.py rename to Cura/gui/util/opengl.py diff --git a/Cura/gui/taskbar.py b/Cura/gui/util/taskbar.py similarity index 100% rename from Cura/gui/taskbar.py rename to Cura/gui/util/taskbar.py diff --git a/Cura/gui/taskbarlib.tlb b/Cura/gui/util/taskbarlib.tlb similarity index 100% rename from Cura/gui/taskbarlib.tlb rename to Cura/gui/util/taskbarlib.tlb diff --git a/Cura/gui/toolbarUtil.py b/Cura/gui/util/toolbarUtil.py similarity index 100% rename from Cura/gui/toolbarUtil.py rename to Cura/gui/util/toolbarUtil.py diff --git a/Cura/gui/webcam.py b/Cura/gui/util/webcam.py similarity index 100% rename from Cura/gui/webcam.py rename to Cura/gui/util/webcam.py