Split gui to gui and util directories.

Cura/cura.py

@@ -16,7 +16,7 @@ import sys
 import platform
 from optparse import OptionParser
 
-from gui import sliceRun
+from util import sliceRun
 
 __author__ = 'Daid'
 __credits__ = """

Cura/cura_sf/__init__.py

@@ -0,0 +1,9 @@
+#This is required to workaround the python import bug where relative imports don't work if the module is imported as a main module.
+import os
+import sys
+numberOfLevelsDeepInPackageHierarchy = 1
+packageFilePath = os.path.abspath(__file__)
+for level in range( numberOfLevelsDeepInPackageHierarchy + 1 ):
+	packageFilePath = os.path.dirname( packageFilePath )
+if packageFilePath not in sys.path:
+	sys.path.insert( 0, packageFilePath )

Cura/cura_sf/fabmetheus_utilities/settings.py

@@ -10,7 +10,7 @@ import __init__
 import os, sys
 import types, math
 
-from gui import profile
+from util import profile
 from fabmetheus_utilities import archive
 
 def DEFSET(setting):

Cura/gui/alterationPanel.py

@@ -1,7 +1,7 @@
 import wx
 import sys,math,threading,os
 
-from gui import profile
+from util import profile
 
 class alterationPanel(wx.Panel):
 	def __init__(self, parent):

Cura/gui/configBase.py

@@ -4,7 +4,7 @@ import __init__
 import wx, os, sys, platform, types
 
 from gui import validators
-from gui import profile
+from util import profile
 
 def main():
 	app = wx.App(False)

Cura/gui/configWizard.py

@@ -5,7 +5,7 @@ import wx, os, platform, types, webbrowser, threading, time, re
 import wx.wizard
 
 from gui import machineCom
-from gui import profile
+from util import profile
 
 class InfoPage(wx.wizard.WizardPageSimple):
 	def __init__(self, parent, title):

Cura/gui/machineCom.py

@@ -9,7 +9,7 @@ from avr_isp import stk500v2
 from avr_isp import ispBase
 from avr_isp import intelHex
 
-from gui import profile
+from util import profile
 
 try:
 	import _winreg

Cura/gui/mainWindow.py

@@ -12,8 +12,8 @@ from gui import validators
 from gui import preferencesDialog
 from gui import configWizard
 from gui import machineCom
-from gui import profile
 from gui import printWindow
+from util import profile
 
 def main():
 	app = wx.App(False)

Cura/gui/preview3d.py

@@ -17,9 +17,9 @@ except:
 	print "Failed to find PyOpenGL: http://pyopengl.sourceforge.net/"
 	hasOpenGLlibs = False
 
-from gui import profile
-from gui import gcodeInterpreter
-from gui import util3d
+from util import profile
+from util import gcodeInterpreter
+from util import util3d
 
 from fabmetheus_utilities.fabmetheus_tools import fabmetheus_interpret
 from fabmetheus_utilities.vector3 import Vector3

Cura/gui/sliceProgessPanel.py

@@ -8,7 +8,7 @@ import threading
 import subprocess
 import time
 
-from gui import sliceRun
+from util import sliceRun
 
 class sliceProgessPanel(wx.Panel):
 	def __init__(self, mainWindow, parent, filename):

Cura/gui/validators.py

@@ -4,7 +4,7 @@ import __init__
 import types
 import math
 
-from gui import profile
+from util import profile
 
 SUCCESS = 0
 WARNING = 1

Cura/util/gcodeInterpreter.py

@@ -7,7 +7,7 @@ import threading
 import re
 import os
 
-from gui import util3d
+from util import util3d
 
 class gcodePath():
 	def __init__(self, newType, pathType, layerNr, startPoint):

Cura/util/sliceRun.py

@@ -3,7 +3,7 @@ from __future__ import absolute_import
 import platform, os, subprocess, sys
 
 from cura_sf.skeinforge_application.skeinforge_utilities import skeinforge_craft
-from gui import profile
+from util import profile
 
 def getPyPyExe():
 	"Return the path to the pypy executable if we can find it. Else return False"