From d631b51e4dbc5ecd8335b74d3f18e66210fc73c4 Mon Sep 17 00:00:00 2001 From: daid Date: Fri, 31 Aug 2012 15:22:30 +0200 Subject: [PATCH] Move the validators from gui to util, they do not have gui specific code. --- Cura/cura.py | 2 +- Cura/gui/configBase.py | 2 +- Cura/gui/expertConfig.py | 2 +- Cura/gui/mainWindow.py | 2 +- Cura/gui/preferencesDialog.py | 2 +- Cura/gui/projectPlanner.py | 2 +- Cura/gui/simpleMode.py | 2 +- Cura/{gui => util}/validators.py | 0 8 files changed, 7 insertions(+), 7 deletions(-) rename Cura/{gui => util}/validators.py (100%) diff --git a/Cura/cura.py b/Cura/cura.py index 215be47..f985676 100644 --- 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 14f38c5..b5f8f85 100644 --- 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 4e3f703..f2ec64a 100644 --- 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 7523ce8..5985d9b 100644 --- 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 843460f..0909697 100644 --- a/Cura/gui/preferencesDialog.py +++ b/Cura/gui/preferencesDialog.py @@ -5,7 +5,7 @@ import wx, os, platform, types, string import ConfigParser from gui import configBase -from gui import validators +from util import validators from util import machineCom from util import profile diff --git a/Cura/gui/projectPlanner.py b/Cura/gui/projectPlanner.py index 29d4779..a9e893b 100644 --- a/Cura/gui/projectPlanner.py +++ b/Cura/gui/projectPlanner.py @@ -20,9 +20,9 @@ from gui import opengl from gui import toolbarUtil from gui import icon from gui import configBase -from gui import validators from gui import printWindow from gui import dropTarget +from util import validators from util import profile from util import util3d from util import stl diff --git a/Cura/gui/simpleMode.py b/Cura/gui/simpleMode.py index ea580e6..97ce00e 100644 --- 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