From 8b3b3e5076d2c69de0644037ff2e790ed9e5eb1a Mon Sep 17 00:00:00 2001 From: daid Date: Tue, 27 Mar 2012 17:20:30 +0200 Subject: [PATCH] Move SF into its own directory, to seperate SF and Cura. Rename newui to gui. --- Cura/cura.py | 6 ++--- .../fabmetheus_utilities/__init__.py | 0 .../fabmetheus_utilities/archive.py | 0 .../fabmetheus_utilities/euclidean.py | 0 .../fabmetheus_tools/__init__.py | 0 .../fabmetheus_tools/alphabetize.py | 0 .../fabmetheus_tools/fabmetheus_interpret.py | 0 .../interpret_plugins/__init__.py | 0 .../fabmetheus_tools/interpret_plugins/csv.py | 0 .../fabmetheus_tools/interpret_plugins/gts.py | 0 .../fabmetheus_tools/interpret_plugins/obj.py | 0 .../fabmetheus_tools/interpret_plugins/slc.py | 0 .../fabmetheus_tools/interpret_plugins/stl.py | 0 .../fabmetheus_tools/interpret_plugins/svg.py | 0 .../fabmetheus_tools/prepare.py | 0 .../fabmetheus_tools/wikifier.py | 0 .../fabmetheus_utilities/gcodec.py | 0 .../fabmetheus_utilities/geometry/__init__.py | 0 .../geometry/creation/__init__.py | 0 .../geometry/creation/_drill.py | 0 .../geometry/creation/_svg.py | 0 .../geometry/creation/circle.py | 0 .../geometry/creation/concatenate.py | 0 .../geometry/creation/extrude.py | 0 .../geometry/creation/gear.py | 0 .../geometry/creation/grid.py | 0 .../geometry/creation/heightmap.py | 0 .../geometry/creation/lathe.py | 0 .../geometry/creation/line.py | 0 .../geometry/creation/linear_bearing_cage.py | 0 .../geometry/creation/lineation.py | 0 .../geometry/creation/mechaslab.py | 0 .../geometry/creation/peg.py | 0 .../geometry/creation/polygon.py | 0 .../geometry/creation/shaft.py | 0 .../geometry/creation/solid.py | 0 .../geometry/creation/sponge_slice.py | 0 .../geometry/creation/square.py | 0 .../geometry/creation/teardrop.py | 0 .../geometry/creation/text.py | 0 .../geometry/geometry_tools/__init__.py | 0 .../geometry/geometry_tools/dictionary.py | 0 .../geometry/geometry_tools/face.py | 0 .../geometry/geometry_tools/path.py | 0 .../geometry_tools/path_elements/__init__.py | 0 .../geometry_tools/path_elements/arc.py | 0 .../geometry_tools/path_elements/cubic.py | 0 .../geometry_tools/path_elements/quadratic.py | 0 .../geometry/geometry_tools/vertex.py | 0 .../geometry/geometry_utilities/__init__.py | 0 .../geometry_utilities/boolean_geometry.py | 0 .../geometry_utilities/boolean_solid.py | 0 .../geometry/geometry_utilities/evaluate.py | 0 .../evaluate_elements/__init__.py | 0 .../evaluate_elements/creation.py | 0 .../evaluate_elements/document.py | 0 .../evaluate_elements/setting.py | 0 .../evaluate_enumerables/__init__.py | 0 .../dictionary_attribute.py | 0 .../evaluate_enumerables/list_attribute.py | 0 .../evaluate_enumerables/string_attribute.py | 0 .../evaluate_fundamentals/__init__.py | 0 .../evaluate_fundamentals/_math.py | 0 .../evaluate_fundamentals/euclid.py | 0 .../evaluate_fundamentals/measure.py | 0 .../evaluate_fundamentals/print.py | 0 .../geometry/geometry_utilities/example.csv | 0 .../geometry/geometry_utilities/matrix.py | 0 .../geometry/manipulation_matrix/__init__.py | 0 .../geometry/manipulation_matrix/_scale.py | 0 .../geometry/manipulation_matrix/rotate.py | 0 .../geometry/manipulation_matrix/transform.py | 0 .../geometry/manipulation_matrix/translate.py | 0 .../geometry/manipulation_meta/__init__.py | 0 .../geometry/manipulation_meta/_array.py | 0 .../geometry/manipulation_meta/_carve.py | 0 .../geometry/manipulation_meta/_copy.py | 0 .../geometry/manipulation_meta/disjoin.py | 0 .../geometry/manipulation_meta/import.py | 0 .../geometry/manipulation_meta/write.py | 0 .../geometry/manipulation_paths/__init__.py | 0 .../geometry/manipulation_paths/bevel.py | 0 .../geometry/manipulation_paths/convex.py | 0 .../geometry/manipulation_paths/outline.py | 0 .../geometry/manipulation_paths/overhang.py | 0 .../geometry/manipulation_paths/round.py | 0 .../geometry/manipulation_paths/segment.py | 0 .../geometry/manipulation_paths/wedge.py | 0 .../geometry/manipulation_shapes/__init__.py | 0 .../geometry/manipulation_shapes/_bottom.py | 0 .../geometry/manipulation_shapes/_inset.py | 0 .../geometry/manipulation_shapes/_outset.py | 0 .../geometry/manipulation_shapes/equation.py | 0 .../geometry/manipulation_shapes/flip.py | 0 .../geometry/manipulation_shapes/mirror.py | 0 .../geometry/solids/__init__.py | 0 .../geometry/solids/cube.py | 0 .../geometry/solids/cylinder.py | 0 .../geometry/solids/difference.py | 0 .../geometry/solids/group.py | 0 .../geometry/solids/intersection.py | 0 .../geometry/solids/sphere.py | 0 .../geometry/solids/triangle_mesh.py | 0 .../geometry/solids/union.py | 0 .../geometry/statements/__init__.py | 0 .../geometry/statements/_print.py | 0 .../geometry/statements/class.py | 0 .../geometry/statements/elif.py | 0 .../geometry/statements/else.py | 0 .../geometry/statements/for.py | 0 .../geometry/statements/function.py | 0 .../geometry/statements/if.py | 0 .../geometry/statements/return.py | 0 .../geometry/statements/statement.py | 0 .../geometry/statements/while.py | 0 .../geometry_plugins/__init__.py | 0 .../geometry_plugins/creation/__init__.py | 0 .../manipulation_matrix/__init__.py | 0 .../manipulation_meta/__init__.py | 0 .../manipulation_paths/__init__.py | 0 .../manipulation_shapes/__init__.py | 0 .../fabmetheus_utilities/intercircle.py | 0 .../fabmetheus_utilities/settings.py | 2 +- .../fabmetheus_utilities/svg_reader.py | 0 .../fabmetheus_utilities/svg_writer.py | 0 .../templates/canvas_template.svg | 0 .../templates/layer_template.svg | 0 .../fabmetheus_utilities/vector3.py | 0 .../fabmetheus_utilities/vector3index.py | 0 .../fabmetheus_utilities/version.txt | 0 .../fabmetheus_utilities/xml_simple_reader.py | 0 .../fabmetheus_utilities/xml_simple_writer.py | 0 .../skeinforge_application/__init__.py | 0 .../skeinforge_plugins/__init__.py | 0 .../skeinforge_plugins/analyze.py | 0 .../analyze_plugins/__init__.py | 0 .../skeinforge_plugins/craft.py | 0 .../craft_plugins/__init__.py | 0 .../craft_plugins/alteration.py | 0 .../craft_plugins/bottom.py | 0 .../skeinforge_plugins/craft_plugins/carve.py | 0 .../craft_plugins/chamber.py | 0 .../skeinforge_plugins/craft_plugins/chop.py | 0 .../craft_plugins/cleave.py | 0 .../skeinforge_plugins/craft_plugins/clip.py | 0 .../skeinforge_plugins/craft_plugins/coil.py | 0 .../skeinforge_plugins/craft_plugins/comb.py | 0 .../skeinforge_plugins/craft_plugins/cool.py | 0 .../craft_plugins/dimension.py | 0 .../skeinforge_plugins/craft_plugins/drill.py | 0 .../craft_plugins/dwindle.py | 0 .../craft_plugins/export.py | 0 .../craft_plugins/export_plugins/__init__.py | 0 .../export_plugins/binary_16_byte.py | 0 .../export_plugins/gcode_step.py | 0 .../export_plugins/gcode_time_segment.py | 0 .../export_plugins/static_plugins/__init__.py | 0 .../static_plugins/gcode_small.py | 0 .../skeinforge_plugins/craft_plugins/feed.py | 0 .../skeinforge_plugins/craft_plugins/fill.py | 0 .../craft_plugins/fillet.py | 0 .../skeinforge_plugins/craft_plugins/flow.py | 0 .../skeinforge_plugins/craft_plugins/home.py | 0 .../skeinforge_plugins/craft_plugins/hop.py | 0 .../skeinforge_plugins/craft_plugins/inset.py | 0 .../craft_plugins/jitter.py | 0 .../skeinforge_plugins/craft_plugins/joris.py | 0 .../skeinforge_plugins/craft_plugins/lash.py | 0 .../skeinforge_plugins/craft_plugins/lift.py | 0 .../skeinforge_plugins/craft_plugins/limit.py | 0 .../skeinforge_plugins/craft_plugins/mill.py | 0 .../craft_plugins/multiply.py | 0 .../craft_plugins/oozebane.py | 0 .../craft_plugins/outset.py | 0 .../craft_plugins/preface.py | 0 .../skeinforge_plugins/craft_plugins/raft.py | 0 .../skeinforge_plugins/craft_plugins/scale.py | 0 .../skeinforge_plugins/craft_plugins/skin.py | 0 .../skeinforge_plugins/craft_plugins/skirt.py | 0 .../craft_plugins/smooth.py | 0 .../skeinforge_plugins/craft_plugins/speed.py | 0 .../craft_plugins/splodge.py | 0 .../craft_plugins/stretch.py | 0 .../craft_plugins/temperature.py | 0 .../skeinforge_plugins/craft_plugins/tower.py | 0 .../craft_plugins/unpause.py | 0 .../craft_plugins/whittle.py | 0 .../skeinforge_plugins/craft_plugins/widen.py | 0 .../skeinforge_plugins/craft_plugins/wipe.py | 0 .../skeinforge_plugins/help.py | 0 .../skeinforge_plugins/meta.py | 0 .../meta_plugins/__init__.py | 0 .../meta_plugins/description.py | 0 .../meta_plugins/polyfile.py | 0 .../skeinforge_plugins/profile.py | 0 .../profile_plugins/__init__.py | 0 .../profile_plugins/cutting.py | 0 .../profile_plugins/extrusion.py | 0 .../profile_plugins/milling.py | 0 .../profile_plugins/winding.py | 0 .../skeinforge_utilities/__init__.py | 0 .../skeinforge_analyze.py | 0 .../skeinforge_utilities/skeinforge_craft.py | 0 .../skeinforge_utilities/skeinforge_help.py | 0 .../skeinforge_utilities/skeinforge_meta.py | 0 .../skeinforge_polyfile.py | 0 .../skeinforge_profile.py | 0 Cura/{newui => gui}/__init__.py | 0 Cura/{newui => gui}/advancedConfig.py | 10 ++++----- Cura/{newui => gui}/alterationPanel.py | 2 +- Cura/{newui => gui}/configBase.py | 4 ++-- Cura/{newui => gui}/configWizard.py | 4 ++-- Cura/{newui => gui}/gcodeInterpreter.py | 2 +- Cura/{newui => gui}/machineCom.py | 2 +- Cura/{newui => gui}/mainWindow.py | 22 +++++++++---------- Cura/{newui => gui}/preferencesDialog.py | 6 ++--- Cura/{newui => gui}/preview3d.py | 6 ++--- Cura/{newui => gui}/printWindow.py | 0 Cura/{newui => gui}/profile.py | 0 Cura/{newui => gui}/sliceProgessPanel.py | 3 ++- Cura/{newui => gui}/sliceRun.py | 6 ++--- Cura/{newui => gui}/util3d.py | 0 Cura/{newui => gui}/validators.py | 2 +- 223 files changed, 39 insertions(+), 38 deletions(-) rename Cura/{ => cura_sf}/fabmetheus_utilities/__init__.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/archive.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/euclidean.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/fabmetheus_tools/__init__.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/fabmetheus_tools/alphabetize.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/fabmetheus_tools/fabmetheus_interpret.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/__init__.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/csv.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/gts.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/obj.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/slc.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/stl.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/svg.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/fabmetheus_tools/prepare.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/fabmetheus_tools/wikifier.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/gcodec.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/__init__.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/creation/__init__.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/creation/_drill.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/creation/_svg.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/creation/circle.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/creation/concatenate.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/creation/extrude.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/creation/gear.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/creation/grid.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/creation/heightmap.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/creation/lathe.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/creation/line.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/creation/linear_bearing_cage.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/creation/lineation.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/creation/mechaslab.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/creation/peg.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/creation/polygon.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/creation/shaft.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/creation/solid.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/creation/sponge_slice.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/creation/square.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/creation/teardrop.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/creation/text.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/geometry_tools/__init__.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/geometry_tools/dictionary.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/geometry_tools/face.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/geometry_tools/path.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/geometry_tools/path_elements/__init__.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/geometry_tools/path_elements/arc.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/geometry_tools/path_elements/cubic.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/geometry_tools/path_elements/quadratic.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/geometry_tools/vertex.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/geometry_utilities/__init__.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/geometry_utilities/boolean_geometry.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/geometry_utilities/boolean_solid.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/geometry_utilities/evaluate.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/__init__.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/creation.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/document.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/setting.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/__init__.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/dictionary_attribute.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/list_attribute.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/string_attribute.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/__init__.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/_math.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/euclid.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/measure.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/print.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/geometry_utilities/example.csv (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/geometry_utilities/matrix.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/manipulation_matrix/__init__.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/manipulation_matrix/_scale.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/manipulation_matrix/rotate.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/manipulation_matrix/transform.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/manipulation_matrix/translate.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/manipulation_meta/__init__.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/manipulation_meta/_array.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/manipulation_meta/_carve.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/manipulation_meta/_copy.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/manipulation_meta/disjoin.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/manipulation_meta/import.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/manipulation_meta/write.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/manipulation_paths/__init__.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/manipulation_paths/bevel.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/manipulation_paths/convex.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/manipulation_paths/outline.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/manipulation_paths/overhang.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/manipulation_paths/round.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/manipulation_paths/segment.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/manipulation_paths/wedge.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/manipulation_shapes/__init__.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/manipulation_shapes/_bottom.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/manipulation_shapes/_inset.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/manipulation_shapes/_outset.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/manipulation_shapes/equation.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/manipulation_shapes/flip.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/manipulation_shapes/mirror.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/solids/__init__.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/solids/cube.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/solids/cylinder.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/solids/difference.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/solids/group.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/solids/intersection.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/solids/sphere.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/solids/triangle_mesh.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/solids/union.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/statements/__init__.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/statements/_print.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/statements/class.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/statements/elif.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/statements/else.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/statements/for.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/statements/function.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/statements/if.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/statements/return.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/statements/statement.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry/statements/while.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry_plugins/__init__.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry_plugins/creation/__init__.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry_plugins/manipulation_matrix/__init__.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry_plugins/manipulation_meta/__init__.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry_plugins/manipulation_paths/__init__.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/geometry_plugins/manipulation_shapes/__init__.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/intercircle.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/settings.py (99%) rename Cura/{ => cura_sf}/fabmetheus_utilities/svg_reader.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/svg_writer.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/templates/canvas_template.svg (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/templates/layer_template.svg (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/vector3.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/vector3index.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/version.txt (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/xml_simple_reader.py (100%) rename Cura/{ => cura_sf}/fabmetheus_utilities/xml_simple_writer.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/__init__.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/__init__.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/analyze.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/analyze_plugins/__init__.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/craft.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/craft_plugins/__init__.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/craft_plugins/alteration.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/craft_plugins/bottom.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/craft_plugins/carve.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/craft_plugins/chamber.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/craft_plugins/chop.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/craft_plugins/cleave.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/craft_plugins/clip.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/craft_plugins/coil.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/craft_plugins/comb.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/craft_plugins/cool.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/craft_plugins/drill.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/craft_plugins/dwindle.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/craft_plugins/export.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/__init__.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/binary_16_byte.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/gcode_step.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/gcode_time_segment.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/static_plugins/__init__.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/static_plugins/gcode_small.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/craft_plugins/feed.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/craft_plugins/fill.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/craft_plugins/fillet.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/craft_plugins/flow.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/craft_plugins/home.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/craft_plugins/hop.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/craft_plugins/inset.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/craft_plugins/jitter.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/craft_plugins/joris.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/craft_plugins/lash.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/craft_plugins/lift.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/craft_plugins/limit.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/craft_plugins/mill.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/craft_plugins/multiply.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/craft_plugins/oozebane.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/craft_plugins/outset.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/craft_plugins/preface.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/craft_plugins/scale.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/craft_plugins/skin.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/craft_plugins/skirt.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/craft_plugins/smooth.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/craft_plugins/speed.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/craft_plugins/splodge.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/craft_plugins/stretch.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/craft_plugins/temperature.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/craft_plugins/tower.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/craft_plugins/unpause.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/craft_plugins/whittle.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/craft_plugins/widen.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/craft_plugins/wipe.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/help.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/meta.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/meta_plugins/__init__.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/meta_plugins/description.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/meta_plugins/polyfile.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/profile.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/profile_plugins/__init__.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/profile_plugins/cutting.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/profile_plugins/extrusion.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/profile_plugins/milling.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_plugins/profile_plugins/winding.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_utilities/__init__.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_utilities/skeinforge_analyze.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_utilities/skeinforge_craft.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_utilities/skeinforge_help.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_utilities/skeinforge_meta.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_utilities/skeinforge_polyfile.py (100%) rename Cura/{ => cura_sf}/skeinforge_application/skeinforge_utilities/skeinforge_profile.py (100%) rename Cura/{newui => gui}/__init__.py (100%) rename Cura/{newui => gui}/advancedConfig.py (96%) rename Cura/{newui => gui}/alterationPanel.py (95%) rename Cura/{newui => gui}/configBase.py (99%) rename Cura/{newui => gui}/configWizard.py (97%) rename Cura/{newui => gui}/gcodeInterpreter.py (99%) rename Cura/{newui => gui}/machineCom.py (99%) rename Cura/{newui => gui}/mainWindow.py (97%) rename Cura/{newui => gui}/preferencesDialog.py (93%) rename Cura/{newui => gui}/preview3d.py (96%) rename Cura/{newui => gui}/printWindow.py (100%) rename Cura/{newui => gui}/profile.py (100%) rename Cura/{newui => gui}/sliceProgessPanel.py (98%) rename Cura/{newui => gui}/sliceRun.py (95%) rename Cura/{newui => gui}/util3d.py (100%) rename Cura/{newui => gui}/validators.py (99%) diff --git a/Cura/cura.py b/Cura/cura.py index b968a941c4..3633e41aa7 100644 --- a/Cura/cura.py +++ b/Cura/cura.py @@ -14,9 +14,9 @@ import __init__ import sys import platform - from optparse import OptionParser -from newui import sliceRun + +from gui import sliceRun __author__ = 'Daid' __credits__ = """ @@ -49,7 +49,7 @@ def main(): if len( args ) > 0: sliceRun.runSlice(args) else: - from newui import mainWindow + from gui import mainWindow mainWindow.main() if __name__ == '__main__': diff --git a/Cura/fabmetheus_utilities/__init__.py b/Cura/cura_sf/fabmetheus_utilities/__init__.py similarity index 100% rename from Cura/fabmetheus_utilities/__init__.py rename to Cura/cura_sf/fabmetheus_utilities/__init__.py diff --git a/Cura/fabmetheus_utilities/archive.py b/Cura/cura_sf/fabmetheus_utilities/archive.py similarity index 100% rename from Cura/fabmetheus_utilities/archive.py rename to Cura/cura_sf/fabmetheus_utilities/archive.py diff --git a/Cura/fabmetheus_utilities/euclidean.py b/Cura/cura_sf/fabmetheus_utilities/euclidean.py similarity index 100% rename from Cura/fabmetheus_utilities/euclidean.py rename to Cura/cura_sf/fabmetheus_utilities/euclidean.py diff --git a/Cura/fabmetheus_utilities/fabmetheus_tools/__init__.py b/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/__init__.py similarity index 100% rename from Cura/fabmetheus_utilities/fabmetheus_tools/__init__.py rename to Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/__init__.py diff --git a/Cura/fabmetheus_utilities/fabmetheus_tools/alphabetize.py b/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/alphabetize.py similarity index 100% rename from Cura/fabmetheus_utilities/fabmetheus_tools/alphabetize.py rename to Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/alphabetize.py diff --git a/Cura/fabmetheus_utilities/fabmetheus_tools/fabmetheus_interpret.py b/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/fabmetheus_interpret.py similarity index 100% rename from Cura/fabmetheus_utilities/fabmetheus_tools/fabmetheus_interpret.py rename to Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/fabmetheus_interpret.py diff --git a/Cura/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/__init__.py b/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/__init__.py similarity index 100% rename from Cura/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/__init__.py rename to Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/__init__.py diff --git a/Cura/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/csv.py b/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/csv.py similarity index 100% rename from Cura/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/csv.py rename to Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/csv.py diff --git a/Cura/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/gts.py b/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/gts.py similarity index 100% rename from Cura/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/gts.py rename to Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/gts.py diff --git a/Cura/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/obj.py b/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/obj.py similarity index 100% rename from Cura/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/obj.py rename to Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/obj.py diff --git a/Cura/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/slc.py b/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/slc.py similarity index 100% rename from Cura/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/slc.py rename to Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/slc.py diff --git a/Cura/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/stl.py b/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/stl.py similarity index 100% rename from Cura/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/stl.py rename to Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/stl.py diff --git a/Cura/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/svg.py b/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/svg.py similarity index 100% rename from Cura/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/svg.py rename to Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/svg.py diff --git a/Cura/fabmetheus_utilities/fabmetheus_tools/prepare.py b/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/prepare.py similarity index 100% rename from Cura/fabmetheus_utilities/fabmetheus_tools/prepare.py rename to Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/prepare.py diff --git a/Cura/fabmetheus_utilities/fabmetheus_tools/wikifier.py b/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/wikifier.py similarity index 100% rename from Cura/fabmetheus_utilities/fabmetheus_tools/wikifier.py rename to Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/wikifier.py diff --git a/Cura/fabmetheus_utilities/gcodec.py b/Cura/cura_sf/fabmetheus_utilities/gcodec.py similarity index 100% rename from Cura/fabmetheus_utilities/gcodec.py rename to Cura/cura_sf/fabmetheus_utilities/gcodec.py diff --git a/Cura/fabmetheus_utilities/geometry/__init__.py b/Cura/cura_sf/fabmetheus_utilities/geometry/__init__.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/__init__.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/__init__.py diff --git a/Cura/fabmetheus_utilities/geometry/creation/__init__.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/__init__.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/creation/__init__.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/creation/__init__.py diff --git a/Cura/fabmetheus_utilities/geometry/creation/_drill.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/_drill.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/creation/_drill.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/creation/_drill.py diff --git a/Cura/fabmetheus_utilities/geometry/creation/_svg.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/_svg.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/creation/_svg.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/creation/_svg.py diff --git a/Cura/fabmetheus_utilities/geometry/creation/circle.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/circle.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/creation/circle.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/creation/circle.py diff --git a/Cura/fabmetheus_utilities/geometry/creation/concatenate.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/concatenate.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/creation/concatenate.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/creation/concatenate.py diff --git a/Cura/fabmetheus_utilities/geometry/creation/extrude.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/extrude.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/creation/extrude.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/creation/extrude.py diff --git a/Cura/fabmetheus_utilities/geometry/creation/gear.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/gear.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/creation/gear.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/creation/gear.py diff --git a/Cura/fabmetheus_utilities/geometry/creation/grid.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/grid.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/creation/grid.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/creation/grid.py diff --git a/Cura/fabmetheus_utilities/geometry/creation/heightmap.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/heightmap.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/creation/heightmap.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/creation/heightmap.py diff --git a/Cura/fabmetheus_utilities/geometry/creation/lathe.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/lathe.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/creation/lathe.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/creation/lathe.py diff --git a/Cura/fabmetheus_utilities/geometry/creation/line.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/line.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/creation/line.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/creation/line.py diff --git a/Cura/fabmetheus_utilities/geometry/creation/linear_bearing_cage.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/linear_bearing_cage.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/creation/linear_bearing_cage.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/creation/linear_bearing_cage.py diff --git a/Cura/fabmetheus_utilities/geometry/creation/lineation.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/lineation.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/creation/lineation.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/creation/lineation.py diff --git a/Cura/fabmetheus_utilities/geometry/creation/mechaslab.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/mechaslab.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/creation/mechaslab.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/creation/mechaslab.py diff --git a/Cura/fabmetheus_utilities/geometry/creation/peg.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/peg.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/creation/peg.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/creation/peg.py diff --git a/Cura/fabmetheus_utilities/geometry/creation/polygon.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/polygon.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/creation/polygon.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/creation/polygon.py diff --git a/Cura/fabmetheus_utilities/geometry/creation/shaft.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/shaft.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/creation/shaft.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/creation/shaft.py diff --git a/Cura/fabmetheus_utilities/geometry/creation/solid.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/solid.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/creation/solid.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/creation/solid.py diff --git a/Cura/fabmetheus_utilities/geometry/creation/sponge_slice.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/sponge_slice.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/creation/sponge_slice.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/creation/sponge_slice.py diff --git a/Cura/fabmetheus_utilities/geometry/creation/square.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/square.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/creation/square.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/creation/square.py diff --git a/Cura/fabmetheus_utilities/geometry/creation/teardrop.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/teardrop.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/creation/teardrop.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/creation/teardrop.py diff --git a/Cura/fabmetheus_utilities/geometry/creation/text.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/text.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/creation/text.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/creation/text.py diff --git a/Cura/fabmetheus_utilities/geometry/geometry_tools/__init__.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/__init__.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/geometry_tools/__init__.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/__init__.py diff --git a/Cura/fabmetheus_utilities/geometry/geometry_tools/dictionary.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/dictionary.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/geometry_tools/dictionary.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/dictionary.py diff --git a/Cura/fabmetheus_utilities/geometry/geometry_tools/face.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/face.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/geometry_tools/face.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/face.py diff --git a/Cura/fabmetheus_utilities/geometry/geometry_tools/path.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/geometry_tools/path.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path.py diff --git a/Cura/fabmetheus_utilities/geometry/geometry_tools/path_elements/__init__.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path_elements/__init__.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/geometry_tools/path_elements/__init__.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path_elements/__init__.py diff --git a/Cura/fabmetheus_utilities/geometry/geometry_tools/path_elements/arc.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path_elements/arc.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/geometry_tools/path_elements/arc.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path_elements/arc.py diff --git a/Cura/fabmetheus_utilities/geometry/geometry_tools/path_elements/cubic.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path_elements/cubic.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/geometry_tools/path_elements/cubic.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path_elements/cubic.py diff --git a/Cura/fabmetheus_utilities/geometry/geometry_tools/path_elements/quadratic.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path_elements/quadratic.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/geometry_tools/path_elements/quadratic.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path_elements/quadratic.py diff --git a/Cura/fabmetheus_utilities/geometry/geometry_tools/vertex.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/vertex.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/geometry_tools/vertex.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/vertex.py diff --git a/Cura/fabmetheus_utilities/geometry/geometry_utilities/__init__.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/__init__.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/geometry_utilities/__init__.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/__init__.py diff --git a/Cura/fabmetheus_utilities/geometry/geometry_utilities/boolean_geometry.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/boolean_geometry.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/geometry_utilities/boolean_geometry.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/boolean_geometry.py diff --git a/Cura/fabmetheus_utilities/geometry/geometry_utilities/boolean_solid.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/boolean_solid.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/geometry_utilities/boolean_solid.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/boolean_solid.py diff --git a/Cura/fabmetheus_utilities/geometry/geometry_utilities/evaluate.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/geometry_utilities/evaluate.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate.py diff --git a/Cura/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/__init__.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/__init__.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/__init__.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/__init__.py diff --git a/Cura/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/creation.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/creation.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/creation.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/creation.py diff --git a/Cura/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/document.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/document.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/document.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/document.py diff --git a/Cura/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/setting.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/setting.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/setting.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/setting.py diff --git a/Cura/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/__init__.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/__init__.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/__init__.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/__init__.py diff --git a/Cura/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/dictionary_attribute.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/dictionary_attribute.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/dictionary_attribute.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/dictionary_attribute.py diff --git a/Cura/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/list_attribute.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/list_attribute.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/list_attribute.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/list_attribute.py diff --git a/Cura/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/string_attribute.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/string_attribute.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/string_attribute.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/string_attribute.py diff --git a/Cura/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/__init__.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/__init__.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/__init__.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/__init__.py diff --git a/Cura/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/_math.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/_math.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/_math.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/_math.py diff --git a/Cura/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/euclid.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/euclid.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/euclid.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/euclid.py diff --git a/Cura/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/measure.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/measure.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/measure.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/measure.py diff --git a/Cura/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/print.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/print.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/print.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/print.py diff --git a/Cura/fabmetheus_utilities/geometry/geometry_utilities/example.csv b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/example.csv similarity index 100% rename from Cura/fabmetheus_utilities/geometry/geometry_utilities/example.csv rename to Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/example.csv diff --git a/Cura/fabmetheus_utilities/geometry/geometry_utilities/matrix.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/matrix.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/geometry_utilities/matrix.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/matrix.py diff --git a/Cura/fabmetheus_utilities/geometry/manipulation_matrix/__init__.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/__init__.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/manipulation_matrix/__init__.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/__init__.py diff --git a/Cura/fabmetheus_utilities/geometry/manipulation_matrix/_scale.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/_scale.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/manipulation_matrix/_scale.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/_scale.py diff --git a/Cura/fabmetheus_utilities/geometry/manipulation_matrix/rotate.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/rotate.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/manipulation_matrix/rotate.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/rotate.py diff --git a/Cura/fabmetheus_utilities/geometry/manipulation_matrix/transform.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/transform.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/manipulation_matrix/transform.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/transform.py diff --git a/Cura/fabmetheus_utilities/geometry/manipulation_matrix/translate.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/translate.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/manipulation_matrix/translate.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/translate.py diff --git a/Cura/fabmetheus_utilities/geometry/manipulation_meta/__init__.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/__init__.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/manipulation_meta/__init__.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/__init__.py diff --git a/Cura/fabmetheus_utilities/geometry/manipulation_meta/_array.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/_array.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/manipulation_meta/_array.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/_array.py diff --git a/Cura/fabmetheus_utilities/geometry/manipulation_meta/_carve.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/_carve.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/manipulation_meta/_carve.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/_carve.py diff --git a/Cura/fabmetheus_utilities/geometry/manipulation_meta/_copy.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/_copy.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/manipulation_meta/_copy.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/_copy.py diff --git a/Cura/fabmetheus_utilities/geometry/manipulation_meta/disjoin.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/disjoin.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/manipulation_meta/disjoin.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/disjoin.py diff --git a/Cura/fabmetheus_utilities/geometry/manipulation_meta/import.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/import.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/manipulation_meta/import.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/import.py diff --git a/Cura/fabmetheus_utilities/geometry/manipulation_meta/write.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/write.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/manipulation_meta/write.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/write.py diff --git a/Cura/fabmetheus_utilities/geometry/manipulation_paths/__init__.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/__init__.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/manipulation_paths/__init__.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/__init__.py diff --git a/Cura/fabmetheus_utilities/geometry/manipulation_paths/bevel.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/bevel.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/manipulation_paths/bevel.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/bevel.py diff --git a/Cura/fabmetheus_utilities/geometry/manipulation_paths/convex.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/convex.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/manipulation_paths/convex.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/convex.py diff --git a/Cura/fabmetheus_utilities/geometry/manipulation_paths/outline.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/outline.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/manipulation_paths/outline.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/outline.py diff --git a/Cura/fabmetheus_utilities/geometry/manipulation_paths/overhang.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/overhang.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/manipulation_paths/overhang.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/overhang.py diff --git a/Cura/fabmetheus_utilities/geometry/manipulation_paths/round.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/round.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/manipulation_paths/round.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/round.py diff --git a/Cura/fabmetheus_utilities/geometry/manipulation_paths/segment.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/segment.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/manipulation_paths/segment.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/segment.py diff --git a/Cura/fabmetheus_utilities/geometry/manipulation_paths/wedge.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/wedge.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/manipulation_paths/wedge.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/wedge.py diff --git a/Cura/fabmetheus_utilities/geometry/manipulation_shapes/__init__.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/__init__.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/manipulation_shapes/__init__.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/__init__.py diff --git a/Cura/fabmetheus_utilities/geometry/manipulation_shapes/_bottom.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/_bottom.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/manipulation_shapes/_bottom.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/_bottom.py diff --git a/Cura/fabmetheus_utilities/geometry/manipulation_shapes/_inset.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/_inset.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/manipulation_shapes/_inset.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/_inset.py diff --git a/Cura/fabmetheus_utilities/geometry/manipulation_shapes/_outset.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/_outset.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/manipulation_shapes/_outset.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/_outset.py diff --git a/Cura/fabmetheus_utilities/geometry/manipulation_shapes/equation.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/equation.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/manipulation_shapes/equation.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/equation.py diff --git a/Cura/fabmetheus_utilities/geometry/manipulation_shapes/flip.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/flip.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/manipulation_shapes/flip.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/flip.py diff --git a/Cura/fabmetheus_utilities/geometry/manipulation_shapes/mirror.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/mirror.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/manipulation_shapes/mirror.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/mirror.py diff --git a/Cura/fabmetheus_utilities/geometry/solids/__init__.py b/Cura/cura_sf/fabmetheus_utilities/geometry/solids/__init__.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/solids/__init__.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/solids/__init__.py diff --git a/Cura/fabmetheus_utilities/geometry/solids/cube.py b/Cura/cura_sf/fabmetheus_utilities/geometry/solids/cube.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/solids/cube.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/solids/cube.py diff --git a/Cura/fabmetheus_utilities/geometry/solids/cylinder.py b/Cura/cura_sf/fabmetheus_utilities/geometry/solids/cylinder.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/solids/cylinder.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/solids/cylinder.py diff --git a/Cura/fabmetheus_utilities/geometry/solids/difference.py b/Cura/cura_sf/fabmetheus_utilities/geometry/solids/difference.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/solids/difference.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/solids/difference.py diff --git a/Cura/fabmetheus_utilities/geometry/solids/group.py b/Cura/cura_sf/fabmetheus_utilities/geometry/solids/group.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/solids/group.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/solids/group.py diff --git a/Cura/fabmetheus_utilities/geometry/solids/intersection.py b/Cura/cura_sf/fabmetheus_utilities/geometry/solids/intersection.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/solids/intersection.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/solids/intersection.py diff --git a/Cura/fabmetheus_utilities/geometry/solids/sphere.py b/Cura/cura_sf/fabmetheus_utilities/geometry/solids/sphere.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/solids/sphere.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/solids/sphere.py diff --git a/Cura/fabmetheus_utilities/geometry/solids/triangle_mesh.py b/Cura/cura_sf/fabmetheus_utilities/geometry/solids/triangle_mesh.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/solids/triangle_mesh.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/solids/triangle_mesh.py diff --git a/Cura/fabmetheus_utilities/geometry/solids/union.py b/Cura/cura_sf/fabmetheus_utilities/geometry/solids/union.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/solids/union.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/solids/union.py diff --git a/Cura/fabmetheus_utilities/geometry/statements/__init__.py b/Cura/cura_sf/fabmetheus_utilities/geometry/statements/__init__.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/statements/__init__.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/statements/__init__.py diff --git a/Cura/fabmetheus_utilities/geometry/statements/_print.py b/Cura/cura_sf/fabmetheus_utilities/geometry/statements/_print.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/statements/_print.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/statements/_print.py diff --git a/Cura/fabmetheus_utilities/geometry/statements/class.py b/Cura/cura_sf/fabmetheus_utilities/geometry/statements/class.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/statements/class.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/statements/class.py diff --git a/Cura/fabmetheus_utilities/geometry/statements/elif.py b/Cura/cura_sf/fabmetheus_utilities/geometry/statements/elif.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/statements/elif.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/statements/elif.py diff --git a/Cura/fabmetheus_utilities/geometry/statements/else.py b/Cura/cura_sf/fabmetheus_utilities/geometry/statements/else.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/statements/else.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/statements/else.py diff --git a/Cura/fabmetheus_utilities/geometry/statements/for.py b/Cura/cura_sf/fabmetheus_utilities/geometry/statements/for.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/statements/for.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/statements/for.py diff --git a/Cura/fabmetheus_utilities/geometry/statements/function.py b/Cura/cura_sf/fabmetheus_utilities/geometry/statements/function.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/statements/function.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/statements/function.py diff --git a/Cura/fabmetheus_utilities/geometry/statements/if.py b/Cura/cura_sf/fabmetheus_utilities/geometry/statements/if.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/statements/if.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/statements/if.py diff --git a/Cura/fabmetheus_utilities/geometry/statements/return.py b/Cura/cura_sf/fabmetheus_utilities/geometry/statements/return.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/statements/return.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/statements/return.py diff --git a/Cura/fabmetheus_utilities/geometry/statements/statement.py b/Cura/cura_sf/fabmetheus_utilities/geometry/statements/statement.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/statements/statement.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/statements/statement.py diff --git a/Cura/fabmetheus_utilities/geometry/statements/while.py b/Cura/cura_sf/fabmetheus_utilities/geometry/statements/while.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry/statements/while.py rename to Cura/cura_sf/fabmetheus_utilities/geometry/statements/while.py diff --git a/Cura/fabmetheus_utilities/geometry_plugins/__init__.py b/Cura/cura_sf/fabmetheus_utilities/geometry_plugins/__init__.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry_plugins/__init__.py rename to Cura/cura_sf/fabmetheus_utilities/geometry_plugins/__init__.py diff --git a/Cura/fabmetheus_utilities/geometry_plugins/creation/__init__.py b/Cura/cura_sf/fabmetheus_utilities/geometry_plugins/creation/__init__.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry_plugins/creation/__init__.py rename to Cura/cura_sf/fabmetheus_utilities/geometry_plugins/creation/__init__.py diff --git a/Cura/fabmetheus_utilities/geometry_plugins/manipulation_matrix/__init__.py b/Cura/cura_sf/fabmetheus_utilities/geometry_plugins/manipulation_matrix/__init__.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry_plugins/manipulation_matrix/__init__.py rename to Cura/cura_sf/fabmetheus_utilities/geometry_plugins/manipulation_matrix/__init__.py diff --git a/Cura/fabmetheus_utilities/geometry_plugins/manipulation_meta/__init__.py b/Cura/cura_sf/fabmetheus_utilities/geometry_plugins/manipulation_meta/__init__.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry_plugins/manipulation_meta/__init__.py rename to Cura/cura_sf/fabmetheus_utilities/geometry_plugins/manipulation_meta/__init__.py diff --git a/Cura/fabmetheus_utilities/geometry_plugins/manipulation_paths/__init__.py b/Cura/cura_sf/fabmetheus_utilities/geometry_plugins/manipulation_paths/__init__.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry_plugins/manipulation_paths/__init__.py rename to Cura/cura_sf/fabmetheus_utilities/geometry_plugins/manipulation_paths/__init__.py diff --git a/Cura/fabmetheus_utilities/geometry_plugins/manipulation_shapes/__init__.py b/Cura/cura_sf/fabmetheus_utilities/geometry_plugins/manipulation_shapes/__init__.py similarity index 100% rename from Cura/fabmetheus_utilities/geometry_plugins/manipulation_shapes/__init__.py rename to Cura/cura_sf/fabmetheus_utilities/geometry_plugins/manipulation_shapes/__init__.py diff --git a/Cura/fabmetheus_utilities/intercircle.py b/Cura/cura_sf/fabmetheus_utilities/intercircle.py similarity index 100% rename from Cura/fabmetheus_utilities/intercircle.py rename to Cura/cura_sf/fabmetheus_utilities/intercircle.py diff --git a/Cura/fabmetheus_utilities/settings.py b/Cura/cura_sf/fabmetheus_utilities/settings.py similarity index 99% rename from Cura/fabmetheus_utilities/settings.py rename to Cura/cura_sf/fabmetheus_utilities/settings.py index 567b5a8c55..626bb04cee 100644 --- a/Cura/fabmetheus_utilities/settings.py +++ b/Cura/cura_sf/fabmetheus_utilities/settings.py @@ -10,7 +10,7 @@ import __init__ import os, sys import types, math -from newui import profile +from gui import profile from fabmetheus_utilities import archive def DEFSET(setting): diff --git a/Cura/fabmetheus_utilities/svg_reader.py b/Cura/cura_sf/fabmetheus_utilities/svg_reader.py similarity index 100% rename from Cura/fabmetheus_utilities/svg_reader.py rename to Cura/cura_sf/fabmetheus_utilities/svg_reader.py diff --git a/Cura/fabmetheus_utilities/svg_writer.py b/Cura/cura_sf/fabmetheus_utilities/svg_writer.py similarity index 100% rename from Cura/fabmetheus_utilities/svg_writer.py rename to Cura/cura_sf/fabmetheus_utilities/svg_writer.py diff --git a/Cura/fabmetheus_utilities/templates/canvas_template.svg b/Cura/cura_sf/fabmetheus_utilities/templates/canvas_template.svg similarity index 100% rename from Cura/fabmetheus_utilities/templates/canvas_template.svg rename to Cura/cura_sf/fabmetheus_utilities/templates/canvas_template.svg diff --git a/Cura/fabmetheus_utilities/templates/layer_template.svg b/Cura/cura_sf/fabmetheus_utilities/templates/layer_template.svg similarity index 100% rename from Cura/fabmetheus_utilities/templates/layer_template.svg rename to Cura/cura_sf/fabmetheus_utilities/templates/layer_template.svg diff --git a/Cura/fabmetheus_utilities/vector3.py b/Cura/cura_sf/fabmetheus_utilities/vector3.py similarity index 100% rename from Cura/fabmetheus_utilities/vector3.py rename to Cura/cura_sf/fabmetheus_utilities/vector3.py diff --git a/Cura/fabmetheus_utilities/vector3index.py b/Cura/cura_sf/fabmetheus_utilities/vector3index.py similarity index 100% rename from Cura/fabmetheus_utilities/vector3index.py rename to Cura/cura_sf/fabmetheus_utilities/vector3index.py diff --git a/Cura/fabmetheus_utilities/version.txt b/Cura/cura_sf/fabmetheus_utilities/version.txt similarity index 100% rename from Cura/fabmetheus_utilities/version.txt rename to Cura/cura_sf/fabmetheus_utilities/version.txt diff --git a/Cura/fabmetheus_utilities/xml_simple_reader.py b/Cura/cura_sf/fabmetheus_utilities/xml_simple_reader.py similarity index 100% rename from Cura/fabmetheus_utilities/xml_simple_reader.py rename to Cura/cura_sf/fabmetheus_utilities/xml_simple_reader.py diff --git a/Cura/fabmetheus_utilities/xml_simple_writer.py b/Cura/cura_sf/fabmetheus_utilities/xml_simple_writer.py similarity index 100% rename from Cura/fabmetheus_utilities/xml_simple_writer.py rename to Cura/cura_sf/fabmetheus_utilities/xml_simple_writer.py diff --git a/Cura/skeinforge_application/__init__.py b/Cura/cura_sf/skeinforge_application/__init__.py similarity index 100% rename from Cura/skeinforge_application/__init__.py rename to Cura/cura_sf/skeinforge_application/__init__.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/__init__.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/__init__.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/__init__.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/__init__.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/analyze.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/analyze.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/analyze.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/analyze.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/analyze_plugins/__init__.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/analyze_plugins/__init__.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/analyze_plugins/__init__.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/analyze_plugins/__init__.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/craft.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/craft.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/craft_plugins/__init__.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/__init__.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/__init__.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/__init__.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/craft_plugins/alteration.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/alteration.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/alteration.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/alteration.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/craft_plugins/bottom.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/bottom.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/bottom.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/bottom.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/craft_plugins/carve.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/carve.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/carve.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/carve.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/craft_plugins/chamber.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/chamber.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/chamber.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/chamber.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/craft_plugins/chop.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/chop.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/chop.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/chop.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/craft_plugins/cleave.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/cleave.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/cleave.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/cleave.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/craft_plugins/clip.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/clip.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/clip.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/clip.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/craft_plugins/coil.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/coil.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/coil.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/coil.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/craft_plugins/comb.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/comb.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/comb.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/comb.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/craft_plugins/cool.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/cool.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/cool.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/cool.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/craft_plugins/drill.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/drill.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/drill.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/drill.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/craft_plugins/dwindle.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/dwindle.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/dwindle.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/dwindle.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/craft_plugins/export.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/export.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/__init__.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/__init__.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/__init__.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/__init__.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/binary_16_byte.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/binary_16_byte.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/binary_16_byte.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/binary_16_byte.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/gcode_step.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/gcode_step.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/gcode_step.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/gcode_step.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/gcode_time_segment.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/gcode_time_segment.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/gcode_time_segment.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/gcode_time_segment.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/static_plugins/__init__.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/static_plugins/__init__.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/static_plugins/__init__.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/static_plugins/__init__.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/static_plugins/gcode_small.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/static_plugins/gcode_small.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/static_plugins/gcode_small.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/static_plugins/gcode_small.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/craft_plugins/feed.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/feed.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/feed.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/feed.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/craft_plugins/fill.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/fill.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/fill.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/fill.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/craft_plugins/fillet.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/fillet.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/fillet.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/fillet.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/craft_plugins/flow.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/flow.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/flow.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/flow.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/craft_plugins/home.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/home.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/home.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/home.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/craft_plugins/hop.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/hop.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/hop.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/hop.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/craft_plugins/inset.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/inset.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/inset.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/inset.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/craft_plugins/jitter.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/jitter.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/jitter.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/jitter.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/craft_plugins/joris.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/joris.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/joris.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/joris.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/craft_plugins/lash.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/lash.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/lash.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/lash.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/craft_plugins/lift.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/lift.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/lift.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/lift.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/craft_plugins/limit.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/limit.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/limit.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/limit.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/craft_plugins/mill.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/mill.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/mill.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/mill.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/craft_plugins/multiply.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/multiply.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/multiply.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/multiply.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/craft_plugins/oozebane.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/oozebane.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/oozebane.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/oozebane.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/craft_plugins/outset.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/outset.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/outset.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/outset.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/craft_plugins/preface.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/preface.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/preface.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/preface.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/craft_plugins/scale.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/scale.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/scale.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/scale.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/craft_plugins/skin.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/skin.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/skin.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/skin.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/craft_plugins/skirt.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/skirt.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/skirt.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/skirt.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/craft_plugins/smooth.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/smooth.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/smooth.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/smooth.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/craft_plugins/speed.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/speed.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/speed.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/speed.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/craft_plugins/splodge.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/splodge.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/splodge.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/splodge.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/craft_plugins/stretch.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/stretch.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/stretch.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/stretch.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/craft_plugins/temperature.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/temperature.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/temperature.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/temperature.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/craft_plugins/tower.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/tower.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/tower.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/tower.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/craft_plugins/unpause.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/unpause.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/unpause.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/unpause.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/craft_plugins/whittle.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/whittle.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/whittle.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/whittle.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/craft_plugins/widen.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/widen.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/widen.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/widen.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/craft_plugins/wipe.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/wipe.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/wipe.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/wipe.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/help.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/help.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/help.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/help.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/meta.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/meta.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/meta.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/meta.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/meta_plugins/__init__.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/meta_plugins/__init__.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/meta_plugins/__init__.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/meta_plugins/__init__.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/meta_plugins/description.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/meta_plugins/description.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/meta_plugins/description.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/meta_plugins/description.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/meta_plugins/polyfile.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/meta_plugins/polyfile.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/meta_plugins/polyfile.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/meta_plugins/polyfile.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/profile.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/profile.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/profile_plugins/__init__.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/__init__.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/profile_plugins/__init__.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/__init__.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/profile_plugins/cutting.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/cutting.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/profile_plugins/cutting.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/cutting.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/profile_plugins/extrusion.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/extrusion.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/profile_plugins/extrusion.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/extrusion.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/profile_plugins/milling.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/milling.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/profile_plugins/milling.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/milling.py diff --git a/Cura/skeinforge_application/skeinforge_plugins/profile_plugins/winding.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/winding.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_plugins/profile_plugins/winding.py rename to Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/winding.py diff --git a/Cura/skeinforge_application/skeinforge_utilities/__init__.py b/Cura/cura_sf/skeinforge_application/skeinforge_utilities/__init__.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_utilities/__init__.py rename to Cura/cura_sf/skeinforge_application/skeinforge_utilities/__init__.py diff --git a/Cura/skeinforge_application/skeinforge_utilities/skeinforge_analyze.py b/Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_analyze.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_utilities/skeinforge_analyze.py rename to Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_analyze.py diff --git a/Cura/skeinforge_application/skeinforge_utilities/skeinforge_craft.py b/Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_craft.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_utilities/skeinforge_craft.py rename to Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_craft.py diff --git a/Cura/skeinforge_application/skeinforge_utilities/skeinforge_help.py b/Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_help.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_utilities/skeinforge_help.py rename to Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_help.py diff --git a/Cura/skeinforge_application/skeinforge_utilities/skeinforge_meta.py b/Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_meta.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_utilities/skeinforge_meta.py rename to Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_meta.py diff --git a/Cura/skeinforge_application/skeinforge_utilities/skeinforge_polyfile.py b/Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_polyfile.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_utilities/skeinforge_polyfile.py rename to Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_polyfile.py diff --git a/Cura/skeinforge_application/skeinforge_utilities/skeinforge_profile.py b/Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_profile.py similarity index 100% rename from Cura/skeinforge_application/skeinforge_utilities/skeinforge_profile.py rename to Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_profile.py diff --git a/Cura/newui/__init__.py b/Cura/gui/__init__.py similarity index 100% rename from Cura/newui/__init__.py rename to Cura/gui/__init__.py diff --git a/Cura/newui/advancedConfig.py b/Cura/gui/advancedConfig.py similarity index 96% rename from Cura/newui/advancedConfig.py rename to Cura/gui/advancedConfig.py index 97852fe1bf..4f9a0c9b82 100644 --- a/Cura/newui/advancedConfig.py +++ b/Cura/gui/advancedConfig.py @@ -4,11 +4,11 @@ import __init__ import wx, os, platform, types import ConfigParser -from newui import configBase -from newui import preview3d -from newui import sliceProgessPanel -from newui import alterationPanel -from newui import validators +from gui import configBase +from gui import preview3d +from gui import sliceProgessPanel +from gui import alterationPanel +from gui import validators class advancedConfigWindow(configBase.configWindowBase): "Advanced configuration window" diff --git a/Cura/newui/alterationPanel.py b/Cura/gui/alterationPanel.py similarity index 95% rename from Cura/newui/alterationPanel.py rename to Cura/gui/alterationPanel.py index c25a1dd209..cd99b62520 100644 --- a/Cura/newui/alterationPanel.py +++ b/Cura/gui/alterationPanel.py @@ -1,7 +1,7 @@ import wx import sys,math,threading,os -from newui import profile +from gui import profile class alterationPanel(wx.Panel): def __init__(self, parent): diff --git a/Cura/newui/configBase.py b/Cura/gui/configBase.py similarity index 99% rename from Cura/newui/configBase.py rename to Cura/gui/configBase.py index 265a687dfa..4b87473ab0 100644 --- a/Cura/newui/configBase.py +++ b/Cura/gui/configBase.py @@ -3,8 +3,8 @@ import __init__ import wx, os, sys, platform, types -from newui import validators -from newui import profile +from gui import validators +from gui import profile def main(): app = wx.App(False) diff --git a/Cura/newui/configWizard.py b/Cura/gui/configWizard.py similarity index 97% rename from Cura/newui/configWizard.py rename to Cura/gui/configWizard.py index 97b3f5b09f..8d72d39e0b 100644 --- a/Cura/newui/configWizard.py +++ b/Cura/gui/configWizard.py @@ -4,8 +4,8 @@ import __init__ import wx, os, platform, types, webbrowser, threading, time, re import wx.wizard -from newui import machineCom -from newui import profile +from gui import machineCom +from gui import profile class InfoPage(wx.wizard.WizardPageSimple): def __init__(self, parent, title): diff --git a/Cura/newui/gcodeInterpreter.py b/Cura/gui/gcodeInterpreter.py similarity index 99% rename from Cura/newui/gcodeInterpreter.py rename to Cura/gui/gcodeInterpreter.py index 334d475683..2b775507a6 100644 --- a/Cura/newui/gcodeInterpreter.py +++ b/Cura/gui/gcodeInterpreter.py @@ -7,7 +7,7 @@ import threading import re import os -from newui import util3d +from gui import util3d class gcodePath(): def __init__(self, newType, pathType, layerNr, startPoint): diff --git a/Cura/newui/machineCom.py b/Cura/gui/machineCom.py similarity index 99% rename from Cura/newui/machineCom.py rename to Cura/gui/machineCom.py index f4dfee66d2..bdf0d458f3 100644 --- a/Cura/newui/machineCom.py +++ b/Cura/gui/machineCom.py @@ -9,7 +9,7 @@ from avr_isp import stk500v2 from avr_isp import ispBase from avr_isp import intelHex -from newui import profile +from gui import profile try: import _winreg diff --git a/Cura/newui/mainWindow.py b/Cura/gui/mainWindow.py similarity index 97% rename from Cura/newui/mainWindow.py rename to Cura/gui/mainWindow.py index d87c38445a..7d33a323d6 100644 --- a/Cura/newui/mainWindow.py +++ b/Cura/gui/mainWindow.py @@ -3,17 +3,17 @@ import __init__ import wx, os, platform, types, webbrowser -from newui import configBase -from newui import advancedConfig -from newui import preview3d -from newui import sliceProgessPanel -from newui import alterationPanel -from newui import validators -from newui import preferencesDialog -from newui import configWizard -from newui import machineCom -from newui import profile -from newui import printWindow +from gui import configBase +from gui import advancedConfig +from gui import preview3d +from gui import sliceProgessPanel +from gui import alterationPanel +from gui import validators +from gui import preferencesDialog +from gui import configWizard +from gui import machineCom +from gui import profile +from gui import printWindow def main(): app = wx.App(False) diff --git a/Cura/newui/preferencesDialog.py b/Cura/gui/preferencesDialog.py similarity index 93% rename from Cura/newui/preferencesDialog.py rename to Cura/gui/preferencesDialog.py index 0cf19c72ac..564a583c57 100644 --- a/Cura/newui/preferencesDialog.py +++ b/Cura/gui/preferencesDialog.py @@ -4,9 +4,9 @@ import __init__ import wx, os, platform, types import ConfigParser -from newui import configBase -from newui import validators -from newui import machineCom +from gui import configBase +from gui import validators +from gui import machineCom class preferencesDialog(configBase.configWindowBase): def __init__(self, parent): diff --git a/Cura/newui/preview3d.py b/Cura/gui/preview3d.py similarity index 96% rename from Cura/newui/preview3d.py rename to Cura/gui/preview3d.py index e9421df80b..ce857722f3 100644 --- a/Cura/newui/preview3d.py +++ b/Cura/gui/preview3d.py @@ -17,9 +17,9 @@ except: print "Failed to find PyOpenGL: http://pyopengl.sourceforge.net/" hasOpenGLlibs = False -from newui import profile -from newui import gcodeInterpreter -from newui import util3d +from gui import profile +from gui import gcodeInterpreter +from gui import util3d from fabmetheus_utilities.fabmetheus_tools import fabmetheus_interpret from fabmetheus_utilities.vector3 import Vector3 diff --git a/Cura/newui/printWindow.py b/Cura/gui/printWindow.py similarity index 100% rename from Cura/newui/printWindow.py rename to Cura/gui/printWindow.py diff --git a/Cura/newui/profile.py b/Cura/gui/profile.py similarity index 100% rename from Cura/newui/profile.py rename to Cura/gui/profile.py diff --git a/Cura/newui/sliceProgessPanel.py b/Cura/gui/sliceProgessPanel.py similarity index 98% rename from Cura/newui/sliceProgessPanel.py rename to Cura/gui/sliceProgessPanel.py index 3c3537c0c6..4fda1ea1cd 100644 --- a/Cura/newui/sliceProgessPanel.py +++ b/Cura/gui/sliceProgessPanel.py @@ -8,7 +8,7 @@ import threading import subprocess import time -from newui import sliceRun +from gui import sliceRun class sliceProgessPanel(wx.Panel): def __init__(self, mainWindow, parent, filename): @@ -115,6 +115,7 @@ class WorkerThread(threading.Thread): self.start() def run(self): + print sliceRun.getSliceCommand(self.filename) p = subprocess.Popen(sliceRun.getSliceCommand(self.filename), stdout=subprocess.PIPE, stderr=subprocess.STDOUT) line = p.stdout.readline() maxValue = 1 diff --git a/Cura/newui/sliceRun.py b/Cura/gui/sliceRun.py similarity index 95% rename from Cura/newui/sliceRun.py rename to Cura/gui/sliceRun.py index d81f4aa1fa..5a32fbe2fa 100644 --- a/Cura/newui/sliceRun.py +++ b/Cura/gui/sliceRun.py @@ -2,8 +2,8 @@ from __future__ import absolute_import import platform, os, subprocess, sys -from skeinforge_application.skeinforge_utilities import skeinforge_craft -from newui import profile +from cura_sf.skeinforge_application.skeinforge_utilities import skeinforge_craft +from gui import profile def getPyPyExe(): "Return the path to the pypy executable if we can find it. Else return False" @@ -116,5 +116,5 @@ def getSliceCommand(filename): pypyExe = getPyPyExe() if pypyExe == False: pypyExe = sys.executable - return [pypyExe, os.path.join(sys.path[0], os.path.split(sys.argv[0])[1]), filename] + return [pypyExe, os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), "..", os.path.split(sys.argv[0])[1])), filename] diff --git a/Cura/newui/util3d.py b/Cura/gui/util3d.py similarity index 100% rename from Cura/newui/util3d.py rename to Cura/gui/util3d.py diff --git a/Cura/newui/validators.py b/Cura/gui/validators.py similarity index 99% rename from Cura/newui/validators.py rename to Cura/gui/validators.py index 6352debd94..55e02547fc 100644 --- a/Cura/newui/validators.py +++ b/Cura/gui/validators.py @@ -4,7 +4,7 @@ import __init__ import types import math -from newui import profile +from gui import profile SUCCESS = 0 WARNING = 1