Fixed the imports.

Cura/cura.py

@@ -16,7 +16,7 @@ from optparse import OptionParser
 
 import wx._core
 
-from util import profile
+from Cura.util import profile
 
 __author__ = 'Daid'
 __credits__ = """
@@ -75,25 +75,25 @@ def main():
 		profile.loadGlobalProfile(options.profileini)
 
 	if options.openprojectplanner is not None:
-		from gui import projectPlanner
+		from Cura.gui import projectPlanner
 		projectPlanner.main()
 	elif options.openflatslicer is not None:
-		from gui import flatSlicerWindow
+		from Cura.gui import flatSlicerWindow
 		flatSlicerWindow.main()
 	elif options.printfile is not None:
-		from gui import printWindow
+		from Cura.gui import printWindow
 		printWindow.startPrintInterface(options.printfile)
 	elif options.slice is not None:
-		from util import sliceRun
+		from Cura.util import sliceRun
 		sliceRun.runSlice(args)
 	else:
 		if len(args) > 0:
 			profile.putPreference('lastFile', ';'.join(args))
 
-		from gui import splashScreen
+		from Cura.gui import splashScreen
 
 		def mainWindowRunCallback(splash):
-			from gui import mainWindow
+			from Cura.gui import mainWindow
 			if splash is not None:
 				splash.Show(False)
 			mainWindow.main()

Cura/cura_sf/fabmetheus_utilities/settings.py

@@ -5,14 +5,14 @@ Settings is a collection of utilities to display, read & write the settings and
 
 from __future__ import absolute_import
 from __future__ import division
+
 #Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module.
-import __init__
+import sys
+import types
+import math
 
-import os, sys
-import types, math
-
-from util import profile
-from fabmetheus_utilities import archive
+from Cura.util import profile
+from Cura.cura_sf.fabmetheus_utilities import archive
 
 def DEFSET(setting):
 	return setting.value

Cura/gui/alterationPanel.py

@@ -1,8 +1,9 @@
-import wx,wx.stc
-import sys,math,threading,os
+from __future__ import absolute_import
 
-from gui import gcodeTextArea
-from util import profile
+import wx, wx.stc
+
+from Cura.gui import gcodeTextArea
+from Cura.util import profile
 
 class alterationPanel(wx.Panel):
 	def __init__(self, parent):

Cura/gui/batchRun.py

@@ -1,12 +1,11 @@
 from __future__ import absolute_import
-import __init__
 
 import wx, os, platform, types, webbrowser, math, subprocess, multiprocessing, threading, time, re, shutil
 
-from util import profile
-from util import sliceRun
-from util import meshLoader
-from gui import dropTarget
+from Cura.util import profile
+from Cura.util import sliceRun
+from Cura.util import meshLoader
+from Cura.gui import dropTarget
 
 class batchRunWindow(wx.Frame):
 	def __init__(self, parent):

Cura/gui/configBase.py

@@ -1,15 +1,9 @@
 from __future__ import absolute_import
-import __init__
 
 import wx, wx.lib.stattext, os, sys, platform, types
 
-from util import validators
-from util import profile
-
-def main():
-	app = wx.App(False)
-	mainWindow()
-	app.MainLoop()
+from Cura.util import validators
+from Cura.util import profile
 
 class configWindowBase(wx.Frame):
 	"A base class for configuration dialogs. Handles creation of settings, and popups"

Cura/gui/configWizard.py

@@ -8,12 +8,11 @@ import time
 import wx
 import wx.wizard
 
-from gui import firmwareInstall
-from gui import toolbarUtil
-from gui import printWindow
-from util import machineCom
-from util import profile
-from util.resources import getPathForImage
+from Cura.gui import firmwareInstall
+from Cura.gui import printWindow
+from Cura.util import machineCom
+from Cura.util import profile
+from Cura.util.resources import getPathForImage
 
 class InfoBox(wx.Panel):
 	def __init__(self, parent):
@@ -297,8 +296,8 @@ class SelectParts(InfoPage):
 		profile.putPreference('has_heated_bed', str(self.heatedBed.GetValue()))
 		if self.dualExtrusion.GetValue():
 			profile.putPreference('extruder_amount', '2')
-		if getPreference('ultimaker_extruder_upgrade') == 'True':
-			putProfileSetting('retraction_enable', 'True')
+		if profile.getPreference('ultimaker_extruder_upgrade') == 'True':
+			profile.putProfileSetting('retraction_enable', 'True')
 
 
 class FirmwareUpgradePage(InfoPage):

Cura/gui/dropTarget.py

@@ -1,5 +1,4 @@
 from __future__ import absolute_import
-import __init__
 
 import wx
 
@@ -12,7 +11,7 @@ class FileDropTarget(wx.FileDropTarget):
 
 	def OnDropFiles(self, x, y, filenames):
 		filteredList = []
-		if self.filenameFilter != None:
+		if self.filenameFilter is not None:
 			for f in filenames:
 				for ext in self.filenameFilter:
 					if f.endswith(ext) or f.endswith(ext.upper()):

Cura/gui/expertConfig.py

@@ -1,14 +1,9 @@
 from __future__ import absolute_import
-import __init__
 
-import wx, os, platform, types
-import ConfigParser
+import wx
 
-from gui import configBase
-from gui import preview3d
-from gui import sliceProgessPanel
-from gui import alterationPanel
-from util import validators
+from Cura.gui import configBase
+from Cura.util import validators
 
 class expertConfigWindow(configBase.configWindowBase):
 	"Expert configuration window"

Cura/gui/firmwareInstall.py

@@ -1,16 +1,13 @@
 from __future__ import absolute_import
-import __init__
 
-import os, glob, wx, threading, sys, time
+import os, wx, threading, sys
 
-from serial import Serial
+from Cura.avr_isp import stk500v2
+from Cura.avr_isp import ispBase
+from Cura.avr_isp import intelHex
 
-from avr_isp import stk500v2
-from avr_isp import ispBase
-from avr_isp import intelHex
-
-from util import machineCom
-from util import profile
+from Cura.util import machineCom
+from Cura.util import profile
 
 def getDefaultFirmware():
 	if profile.getPreference('machine_type') == 'ultimaker':

Cura/gui/flatSlicerWindow.py

@@ -1,7 +1,10 @@
-import wx, os, platform, types, webbrowser
+from __future__ import absolute_import
+
+import wx
+import os
 
 from wx import glcanvas
-import wx
+
 try:
 	import OpenGL
 	OpenGL.ERROR_CHECKING = False
@@ -12,12 +15,12 @@ except:
 	print "Failed to find PyOpenGL: http://pyopengl.sourceforge.net/"
 	hasOpenGLlibs = False
 
-from gui import toolbarUtil
-from gui import opengl
-from util import util3d
-from util import svg
-from util import profile
-from util import version
+from Cura.gui import toolbarUtil
+from Cura.gui import opengl
+from Cura.util import util3d
+from Cura.util import svg
+from Cura.util import profile
+from Cura.util import version
 
 class flatSlicerWindow(wx.Frame):
 	"Cura 2D SVG slicer"

Cura/gui/gcodeTextArea.py

@@ -1,7 +1,10 @@
-import wx, wx.stc
-import sys,math,os
+from __future__ import absolute_import
 
-from util import profile
+import wx
+import wx.stc
+import sys
+
+from Cura.util import profile
 
 class GcodeTextArea(wx.stc.StyledTextCtrl):
 	def __init__(self, parent):

Cura/gui/mainWindow.py

@@ -1,29 +1,33 @@
 from __future__ import absolute_import
-import __init__
 
-import wx, os, platform, types, webbrowser, shutil, glob
+import wx
+import os
+import platform
+import webbrowser
+import shutil
+import glob
 
-from gui import configBase
-from gui import expertConfig
-from gui import preview3d
-from gui import sliceProgessPanel
-from gui import alterationPanel
-from gui import pluginPanel
-from gui import preferencesDialog
-from gui import configWizard
-from gui import firmwareInstall
-from gui import printWindow
-from gui import simpleMode
-from gui import projectPlanner
-from gui import batchRun
-from gui import flatSlicerWindow
-from gui import icon
-from gui import dropTarget
-from util import validators
-from util import profile
-from util import version
-from util import sliceRun
-from util import meshLoader
+from Cura.gui import configBase
+from Cura.gui import expertConfig
+from Cura.gui import preview3d
+from Cura.gui import sliceProgessPanel
+from Cura.gui import alterationPanel
+from Cura.gui import pluginPanel
+from Cura.gui import preferencesDialog
+from Cura.gui import configWizard
+from Cura.gui import firmwareInstall
+from Cura.gui import printWindow
+from Cura.gui import simpleMode
+from Cura.gui import projectPlanner
+from Cura.gui import batchRun
+from Cura.gui import flatSlicerWindow
+from Cura.gui import icon
+from Cura.gui import dropTarget
+from Cura.util import validators
+from Cura.util import profile
+from Cura.util import version
+from Cura.util import sliceRun
+from Cura.util import meshLoader
 
 def main():
 	#app = wx.App(False)

Cura/gui/opengl.py

@@ -3,10 +3,10 @@ from __future__ import absolute_import
 
 import math
 
-from util import meshLoader
-from util import util3d
-from util import profile
-from util.resources import getPathForMesh
+from Cura.util import meshLoader
+from Cura.util import util3d
+from Cura.util import profile
+from Cura.util.resources import getPathForMesh
 
 try:
 	import OpenGL

Cura/gui/pluginPanel.py

@@ -1,9 +1,11 @@
-import wx, wx.stc
-import sys, math, threading, os, webbrowser
+from __future__ import absolute_import
+
+import wx
+import webbrowser
 from wx.lib import scrolledpanel
 
-from util import profile
-from util import exporer
+from Cura.util import profile
+from Cura.util import exporer
 
 class pluginPanel(wx.Panel):
 	def __init__(self, parent):

Cura/gui/preferencesDialog.py

@@ -1,13 +1,11 @@
 from __future__ import absolute_import
-import __init__
 
-import wx, os, platform, types, string, glob, stat
-import ConfigParser
+import wx
 
-from gui import configBase
-from util import validators
-from util import machineCom
-from util import profile
+from Cura.gui import configBase
+from Cura.util import validators
+from Cura.util import machineCom
+from Cura.util import profile
 
 class preferencesDialog(configBase.configWindowBase):
 	def __init__(self, parent):

Cura/gui/preview3d.py

@@ -1,6 +1,11 @@
+from __future__ import absolute_import
 from __future__ import division
 
-import sys, math, threading, re, time, os
+import math
+import threading
+import re
+import time
+import os
 import numpy
 
 from wx import glcanvas
@@ -15,14 +20,14 @@ except:
 	print "Failed to find PyOpenGL: http://pyopengl.sourceforge.net/"
 	hasOpenGLlibs = False
 
-from gui import opengl
-from gui import toolbarUtil
+from Cura.gui import opengl
+from Cura.gui import toolbarUtil
 
-from util import profile
-from util import gcodeInterpreter
-from util import meshLoader
-from util import util3d
-from util import sliceRun
+from Cura.util import profile
+from Cura.util import gcodeInterpreter
+from Cura.util import meshLoader
+from Cura.util import util3d
+from Cura.util import sliceRun
 
 class previewObject():
 	def __init__(self):

Cura/gui/printWindow.py

@@ -11,15 +11,12 @@ import platform
 import wx
 from wx.lib import buttons
 
-from gui import icon
-from gui import toolbarUtil
-from gui import webcam
-from gui import taskbar
-from util import machineCom
-from util import profile
-from util import gcodeInterpreter
-from util import power
-from util.resources import getPathForImage
+from Cura.gui import webcam
+from Cura.gui import taskbar
+from Cura.util import machineCom
+from Cura.util import gcodeInterpreter
+from Cura.util import power
+from Cura.util.resources import getPathForImage
 
 printWindowMonitorHandle = None
 

Cura/gui/projectPlanner.py

@@ -1,7 +1,11 @@
 from __future__ import absolute_import
-import __init__
 
-import wx, os, platform, types, webbrowser, math, subprocess, threading, time, re, shutil
+import wx
+import os
+import threading
+import time
+import re
+import shutil
 import ConfigParser
 import numpy
 
@@ -16,22 +20,21 @@ except:
 	print "Failed to find PyOpenGL: http://pyopengl.sourceforge.net/"
 	hasOpenGLlibs = False
 
-from gui import opengl
-from gui import toolbarUtil
-from gui import icon
-from gui import configBase
-from gui import printWindow
-from gui import dropTarget
-from gui import taskbar
-from util import validators
-from util import profile
-from util import util3d
-from util import meshLoader
-from util import stl
-from util import mesh
-from util import sliceRun
-from util import gcodeInterpreter
-from util import exporer
+from Cura.gui import opengl
+from Cura.gui import toolbarUtil
+from Cura.gui import configBase
+from Cura.gui import printWindow
+from Cura.gui import dropTarget
+from Cura.gui import taskbar
+from Cura.util import validators
+from Cura.util import profile
+from Cura.util import util3d
+from Cura.util import meshLoader
+from Cura.util import stl
+from Cura.util import mesh
+from Cura.util import sliceRun
+from Cura.util import gcodeInterpreter
+from Cura.util import exporer
 
 class Action(object):
 	pass

Cura/gui/simpleMode.py

@@ -1,22 +1,19 @@
 from __future__ import absolute_import
-import __init__
 
-import wx, os, platform, types, webbrowser
+import wx
+import os
+import webbrowser
 
-from gui import configBase
-from gui import preview3d
-from gui import sliceProgessPanel
-from gui import preferencesDialog
-from gui import configWizard
-from gui import firmwareInstall
-from gui import dropTarget
-from gui import printWindow
-from gui import icon
-from util import validators
-from util import profile
-from util import version
-from util import sliceRun
-from util import meshLoader
+from Cura.gui import configBase
+from Cura.gui import preview3d
+from Cura.gui import sliceProgessPanel
+from Cura.gui import preferencesDialog
+from Cura.gui import dropTarget
+from Cura.gui import printWindow
+from Cura.util import profile
+from Cura.util import version
+from Cura.util import sliceRun
+from Cura.util import meshLoader
 
 class simpleModeWindow(configBase.configWindowBase):
 	"Main user interface window for Quickprint mode"

Cura/gui/sliceProgessPanel.py

@@ -1,14 +1,19 @@
 from __future__ import absolute_import
-import __init__
 
-import wx, sys, os, shutil, math, threading, subprocess, time, re, platform
+import wx
+import os
+import shutil
+import threading
+import time
+import re
+import platform
 
-from gui import taskbar
-from gui import preferencesDialog
-from util import profile
-from util import sliceRun
-from util import exporer
-from util import gcodeInterpreter
+from Cura.gui import taskbar
+from Cura.gui import preferencesDialog
+from Cura.util import profile
+from Cura.util import sliceRun
+from Cura.util import exporer
+from Cura.util import gcodeInterpreter
 
 class sliceProgessPanel(wx.Panel):
 	def __init__(self, mainWindow, parent, filelist):

Cura/gui/splashScreen.py

@@ -3,7 +3,7 @@ from __future__ import absolute_import
 
 import wx._core #We only need the core here, which speeds up the import. As we want to show the splashscreen ASAP.
 
-from util.resources import getPathForImage
+from Cura.util.resources import getPathForImage
 
 
 class splashScreen(wx.SplashScreen):

Cura/gui/taskbar.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 try:
 	import comtypes.client as cc
 	cc.GetModule('taskbarlib.tlb')

Cura/gui/toolbarUtil.py

@@ -5,8 +5,8 @@ from __future__ import division
 import wx
 from wx.lib import buttons
 
-from util import profile
-from util.resources import getPathForImage
+from Cura.util import profile
+from Cura.util.resources import getPathForImage
 
 
 #######################################################

Cura/gui/webcam.py

@@ -8,9 +8,8 @@ import platform
 
 import wx
 
-from util import profile
-from util.resources import getPathForImage
-from gui import toolbarUtil
+from Cura.util import profile
+from Cura.util.resources import getPathForImage
 
 try:
 	#Try to find the OpenCV library for video capture.

Cura/util/dae.py

@@ -1,7 +1,8 @@
-import sys, math, re, os, struct, time
+from __future__ import absolute_import
+
 from  xml.parsers.expat import ParserCreate
 
-import mesh
+from Cura.util import mesh
 
 class daeModel(mesh.mesh):
 	def __init__(self):

Cura/util/exporer.py

@@ -1,4 +1,8 @@
-import sys, os, subprocess
+from __future__ import absolute_import
+
+import sys
+import os
+import subprocess
 
 def hasExporer():
 	if sys.platform == 'win32' or sys.platform == 'cygwin' or sys.platform == 'darwin':

Cura/util/gcodeInterpreter.py

@@ -1,10 +1,12 @@
+from __future__ import absolute_import
+
 import sys
 import math
 import re
 import os
 
-import util3d
-import profile
+from Cura.util import util3d
+from Cura.util import profile
 
 class gcodePath(object):
 	def __init__(self, newType, pathType, layerThickness, startPoint):

Cura/util/machineCom.py

@@ -1,17 +1,22 @@
 from __future__ import absolute_import
-import __init__
 
-import os, glob, sys, time, math, re, traceback, threading
+import os
+import glob
+import sys
+import time
+import math
+import re
+import traceback
+import threading
 import Queue as queue
 
 import serial
 
-from avr_isp import stk500v2
-from avr_isp import ispBase
-from avr_isp import intelHex
+from Cura.avr_isp import stk500v2
+from Cura.avr_isp import ispBase
 
-from util import profile
-from util import version
+from Cura.util import profile
+from Cura.util import version
 
 try:
 	import _winreg

Cura/util/mesh.py

@@ -1,9 +1,12 @@
-import sys, math, re, os, struct, time
+from __future__ import absolute_import
 
-import util3d
+import time
+import math
 
 import numpy
 
+from Cura.util import util3d
+
 class mesh(object):
 	def __init__(self):
 		self.vertexes = None

Cura/util/meshLoader.py

@@ -1,7 +1,8 @@
+from __future__ import absolute_import
 
-import stl
-import obj
-import dae
+from Cura.util import stl
+from Cura.util import obj
+from Cura.util import dae
 
 def supportedExtensions():
 	return ['.stl', '.obj', '.dae']

Cura/util/obj.py

@@ -1,6 +1,6 @@
-import sys, math, re, os, struct, time
+from __future__ import absolute_import
 
-import mesh
+from Cura.util import mesh
 
 class objModel(mesh.mesh):
 	def __init__(self):

Cura/util/profile.py

@@ -1,7 +1,5 @@
 from __future__ import absolute_import
 from __future__ import division
-#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module.
-import __init__
 
 import os, traceback, math, re, zlib, base64, time, sys, platform, glob, string, stat
 import cPickle as pickle
@@ -10,7 +8,7 @@ if sys.version_info[0] < 3:
 else:
 	import configparser as ConfigParser
 
-from util import version
+from Cura.util import version
 
 #########################################################
 ## Default settings when none are found.

Cura/util/sliceRun.py

@@ -1,14 +1,17 @@
 from __future__ import absolute_import
 
-import platform, os, subprocess, sys
+import platform
+import os
+import subprocess
+import sys
 
 if not hasattr(sys, 'frozen'):
 	cura_sf_path = os.path.normpath(os.path.join(os.path.dirname(os.path.abspath(__file__)), "../cura_sf/"))
 	if cura_sf_path not in sys.path:
 		sys.path.append(cura_sf_path)
-	from skeinforge_application.skeinforge_utilities import skeinforge_craft
+	from Cura.cura_sf.skeinforge_application.skeinforge_utilities import skeinforge_craft
 
-from util import profile
+from Cura.util import profile
 
 #How long does each step take compared to the others. This is used to make a better scaled progress bar, and guess time left.
 sliceStepTimeFactor = {

Cura/util/stl.py

@@ -1,6 +1,11 @@
-import sys, math, re, os, struct, time
+from __future__ import absolute_import
 
-import mesh
+import sys
+import os
+import struct
+import time
+
+from Cura.util import mesh
 
 class stlModel(mesh.mesh):
 	def __init__(self):

Cura/util/svg.py

@@ -1,4 +1,6 @@
-import sys, math, re, os, struct, time
+from __future__ import absolute_import
+
+import math
 from xml.etree import ElementTree
 
 import profile

Cura/util/util3d.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 import math
 import numpy
 

Cura/util/validators.py

@@ -1,11 +1,10 @@
 from __future__ import absolute_import
 from __future__ import division
-import __init__
 
 import types
 import math
 
-from util import profile
+from Cura.util import profile
 
 SUCCESS = 0
 WARNING = 1

Cura/util/version.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 import os
 
 def getVersion(getGitVersion = True):