Move the validators from gui to util, they do not have gui specific code.

diff --git a/Cura/cura.py b/Cura/cura.py
index 215be473bd9fcd5b376d4fd3e1f0fef89fafdf2c..f98567617bf9e1c8849d4eb874fecc05f8491775 100644 (file)
--- a/Cura/cura.py
+++ b/Cura/cura.py
@@ -16,7 +16,6 @@ import platform
 from optparse import OptionParser
 
 from util import profile
-from util import sliceRun
 
 __author__ = 'Daid'
 __credits__ = """
@@ -69,6 +68,7 @@ def main():
                return
 
        if options.slice != None:
+               from util import sliceRun
                sliceRun.runSlice(args)
        else:
                if len(args) > 0:

diff --git a/Cura/gui/configBase.py b/Cura/gui/configBase.py
index 14f38c547074e9420707907b86803a7de7773681..b5f8f85f2d55c49e034ae7eb78ce77bf3effd10f 100644 (file)
--- a/Cura/gui/configBase.py
+++ b/Cura/gui/configBase.py
@@ -3,7 +3,7 @@ import __init__
 
 import wx, wx.lib.stattext, os, sys, platform, types
 
-from gui import validators
+from util import validators
 from util import profile
 
 def main():

diff --git a/Cura/gui/expertConfig.py b/Cura/gui/expertConfig.py
index 4e3f703dadcc21f82af2b006ab81e12174e1176e..f2ec64a763ac1da63f254aa130e8898c5133ad3f 100644 (file)
--- a/Cura/gui/expertConfig.py
+++ b/Cura/gui/expertConfig.py
@@ -8,7 +8,7 @@ from gui import configBase
 from gui import preview3d
 from gui import sliceProgessPanel
 from gui import alterationPanel
-from gui import validators
+from util import validators
 
 class expertConfigWindow(configBase.configWindowBase):
        "Expert configuration window"

diff --git a/Cura/gui/mainWindow.py b/Cura/gui/mainWindow.py
index 7523ce8906a92392b263113846562941b7cbd94f..5985d9b084f76991e6e33b04d3e91133e33285de 100644 (file)
--- a/Cura/gui/mainWindow.py
+++ b/Cura/gui/mainWindow.py
@@ -8,7 +8,6 @@ from gui import expertConfig
 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 firmwareInstall
@@ -19,6 +18,7 @@ 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

diff --git a/Cura/gui/preferencesDialog.py b/Cura/gui/preferencesDialog.py
index 843460f30897b4e5d3417db946c695f758067c02..0909697d06c7afe48d9de115757181cfd5e12f63 100644 (file)
--- a/Cura/gui/preferencesDialog.py
+++ b/Cura/gui/preferencesDialog.py
@@ -5,7 +5,7 @@ import wx, os, platform, types, string
 import ConfigParser\r
 \r
 from gui import configBase\r
-from gui import validators\r
+from util import validators\r
 from util import machineCom\r
 from util import profile\r
 \r

diff --git a/Cura/gui/projectPlanner.py b/Cura/gui/projectPlanner.py
index 29d477934d02f15357c0571ab493c85033a2727a..a9e893b9ad67c3ebef56b419f9a176b8f14517f1 100644 (file)
--- a/Cura/gui/projectPlanner.py
+++ b/Cura/gui/projectPlanner.py
@@ -20,9 +20,9 @@ from gui import opengl
 from gui import toolbarUtil\r
 from gui import icon\r
 from gui import configBase\r
-from gui import validators\r
 from gui import printWindow\r
 from gui import dropTarget\r
+from util import validators\r
 from util import profile\r
 from util import util3d\r
 from util import stl\r

diff --git a/Cura/gui/simpleMode.py b/Cura/gui/simpleMode.py
index ea580e6651cd09e359f34e18fe62b15e4407ba19..97ce00e9e9cfc8ac5463bc8315159aa7ee4d5d17 100644 (file)
--- a/Cura/gui/simpleMode.py
+++ b/Cura/gui/simpleMode.py
@@ -6,12 +6,12 @@ import wx, os, platform, types, webbrowser
 from gui import configBase
 from gui import preview3d
 from gui import sliceProgessPanel
-from gui import validators
 from gui import preferencesDialog
 from gui import configWizard
 from gui import firmwareInstall
 from gui import printWindow
 from gui import icon
+from util import validators
 from util import profile
 from util import version
 from util import sliceRun

diff --git a/Cura/gui/validators.py b/Cura/util/validators.py
similarity index 100%
rename from Cura/gui/validators.py
rename to Cura/util/validators.py