Move some gui utility files into a seperate location so the code gets a bit more...

diff --git a/Cura/gui/alterationPanel.py b/Cura/gui/alterationPanel.py
index e67b21171c18c6b5dfa537629e2968b361d52679..4646c51ef09f1d708c72b40f059d744b52807467 100644 (file)
--- a/Cura/gui/alterationPanel.py
+++ b/Cura/gui/alterationPanel.py
@@ -2,7 +2,7 @@ from __future__ import absolute_import
 
 import wx, wx.stc
 
-from Cura.gui import gcodeTextArea
+from Cura.gui.util import gcodeTextArea
 from Cura.util import profile
 
 class alterationPanel(wx.Panel):

diff --git a/Cura/gui/batchRun.py b/Cura/gui/batchRun.py
index 003e40df36759666648215d10dbaafd18f66fe69..0b545d2e42c8c3d65a1b8b5f77f4a7edceebd435 100644 (file)
--- a/Cura/gui/batchRun.py
+++ b/Cura/gui/batchRun.py
@@ -5,7 +5,7 @@ import wx, os, multiprocessing, threading, time, shutil
 from Cura.util import profile
 from Cura.util import sliceRun
 from Cura.util import meshLoader
-from Cura.gui import dropTarget
+from Cura.gui.util import dropTarget
 
 class batchRunWindow(wx.Frame):
        def __init__(self, parent):
@@ -19,7 +19,6 @@ class batchRunWindow(wx.Frame):
                self.panel = wx.Panel(self, -1)
                self.SetSizer(wx.BoxSizer(wx.VERTICAL))
                self.GetSizer().Add(self.panel, 1, flag=wx.EXPAND)
-               #self.SetIcon(icon.getMainIcon())
 
                self.sizer = wx.GridBagSizer(2,2)
                self.panel.SetSizer(self.sizer)
@@ -61,7 +60,7 @@ class batchRunWindow(wx.Frame):
                        self._updateListbox()
 
        def OnRemModel(self, e):
-               if self.selection == None:
+               if self.selection is None:
                        return
                self.list.remove(self.selection)
                self._updateListbox()

diff --git a/Cura/gui/flatSlicerWindow.py b/Cura/gui/flatSlicerWindow.py
index a5de99c43c33a62c0a853c6552e078699a1c2e18..6a8c4cd0d32aa01cb4da690143bd52b3689757a7 100644 (file)
--- a/Cura/gui/flatSlicerWindow.py
+++ b/Cura/gui/flatSlicerWindow.py
@@ -15,8 +15,8 @@ except:
        print "Failed to find PyOpenGL: http://pyopengl.sourceforge.net/"
        hasOpenGLlibs = False
 
-from Cura.gui import toolbarUtil
-from Cura.gui import opengl
+from Cura.gui.util import toolbarUtil
+from Cura.gui.util import opengl
 from Cura.util import util3d
 from Cura.util import svg
 from Cura.util import profile
@@ -35,7 +35,6 @@ class flatSlicerWindow(wx.Frame):
                self.panel = wx.Panel(self, -1)
                self.SetSizer(wx.BoxSizer(wx.VERTICAL))
                self.GetSizer().Add(self.panel, 1, flag=wx.EXPAND)
-               #self.SetIcon(icon.getMainIcon())
 
                self.toolbar = toolbarUtil.Toolbar(self.panel)
 

diff --git a/Cura/gui/icon.py b/Cura/gui/icon.py
deleted file mode 100644 (file)
index 8b53bbf..0000000
--- a/Cura/gui/icon.py
+++ /dev/null
@@ -1,27 +0,0 @@
-#----------------------------------------------------------------------
-# This file was generated by /usr/bin/img2py
-#
-from wx.lib.embeddedimage import PyEmbeddedImage
-
-Main = PyEmbeddedImage(
-    "iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAIAAAD9MqGbAAAAA3NCSVQICAjb4U/gAAAC/klE"
-    "QVQ4jYWUe0hTYRTAz+5rd5uPys2Z89mtLLecPRQpZw+ishf0gB5EQRZFWY20h/6jGQWSlJRR"
-    "RFGRFJXRHw3ECpRWbqRZq1WabErqqjWd7XF3d7e72x8rfKX9/jsf349zzncOn6DyPRuPBeAv"
-    "IY5DUBT+hy2IY/FYII1g2s2mi5Vl7WZTMBhQZS5Qqefbf3w7UlIxeYp0PBkDgMYGXenhAo4L"
-    "yqcqUqiZpjfGVoMeAFat35yjWTau6f3lrCwrxgn8bNWNxcvzERRl/f4TB3e9ano2ccHYuxcN"
-    "A46fqzdsWbpybfiIEAr3aUsYH52mzJjAROVJVOdbo7bkdMiod+gbvZYv0Sq1NDZuLoK4Xzc7"
-    "W43ipBRMEjFK6+cwjKHdABDNsh9KtQAgmTY9cctO1vHTdOxA+FJMTi4ZGzc2JyJTpACAE8fy"
-    "6l8RUtmfgqWyvAajYuPWcEgHPf8wZ2drAODW1WoylUKFJAA0ftWteaTMb15SPutpbwIUWg4t"
-    "u5eyXadptj0f0WdBxWWht/+Z7vH929cyvF6cDzVh/k6nmZUwHpR5O0/gDnnykvKtvzp6XJa1"
-    "1LahPgHg8MlTU6SxN2rO9TNMyEc3XKojRaLIokludFD+nT+jqVZQqS55LhE1ffiGCe588qYR"
-    "DAAEPe6Wmirn9RoifY4sc0GpvNaHBo62ALIUEFQIJgGdHSNiB9Lnlien7elgSWRoshGRWYXF"
-    "8es2cV2Wzrs3AUDE4QCAmElKqc08cCUr4ziOitvbynieg/D2DZczL1xzuey2XjPeUeTjaNV5"
-    "HdgNLk833VuP4ZFCkdw9+ImhbYDPGGGG2f9ik9X5GUeJAMfWPslJFyvEfgcvQAR8aESaURrP"
-    "c3szTnzsbwMAkrbFdz1kAOwzd29WnxShoveGwj7rg9EvNBZbd52xrYKKW5RI7XA6Wn701A86"
-    "WhFUSCm1ePKGiUwA0Os03pdWUPMAEOL8jFgBACTdJ5tXLRj1J4yFcRh89qao6ASIWcH5He5A"
-    "lwRiBqIX/gbbS0S3wHAu3wAAAABJRU5ErkJggg==")
-getMainData = Main.GetData
-getMainImage = Main.GetImage
-getMainBitmap = Main.GetBitmap
-getMainIcon = Main.GetIcon
-

diff --git a/Cura/gui/mainWindow.py b/Cura/gui/mainWindow.py
index 9eba31640c30f86b20f3cf6c129556273b216f02..af2bb74639d4da9da2ba353f6ec1082be9e1624e 100644 (file)
--- a/Cura/gui/mainWindow.py
+++ b/Cura/gui/mainWindow.py
@@ -21,7 +21,7 @@ from Cura.gui import simpleMode
 from Cura.gui import projectPlanner
 from Cura.gui import batchRun
 from Cura.gui import flatSlicerWindow
-from Cura.gui import dropTarget
+from Cura.gui.util import dropTarget
 from Cura.util import validators
 from Cura.util import profile
 from Cura.util import version
@@ -57,7 +57,6 @@ class mainWindow(configBase.configWindowBase):
                extruderCount = int(profile.getPreference('extruder_amount'))
 
                wx.EVT_CLOSE(self, self.OnClose)
-               #self.SetIcon(icon.getMainIcon())
 
                self.SetDropTarget(dropTarget.FileDropTarget(self.OnDropFiles, meshLoader.supportedExtensions()))
 

diff --git a/Cura/gui/preview3d.py b/Cura/gui/preview3d.py
index ddfa93e40eaed7d229e4ce91f816f21434743e6b..4f2b489dbed6152aa9d6b28082c8325625c0d129 100644 (file)
--- a/Cura/gui/preview3d.py
+++ b/Cura/gui/preview3d.py
@@ -20,8 +20,8 @@ except:
        print "Failed to find PyOpenGL: http://pyopengl.sourceforge.net/"
        hasOpenGLlibs = False
 
-from Cura.gui import opengl
-from Cura.gui import toolbarUtil
+from Cura.gui.util import opengl
+from Cura.gui.util import toolbarUtil
 
 from Cura.util import profile
 from Cura.util import gcodeInterpreter

diff --git a/Cura/gui/printWindow.py b/Cura/gui/printWindow.py
index 04820877ac5acc06d0e19255ce46cc8efc44363f..3a57bb45833d2b6f7085de9c0ccf2120c29bcf46 100644 (file)
--- a/Cura/gui/printWindow.py
+++ b/Cura/gui/printWindow.py
@@ -11,8 +11,8 @@ import platform
 import wx
 from wx.lib import buttons
 
-from Cura.gui import webcam
-from Cura.gui import taskbar
+from Cura.gui.util import webcam
+from Cura.gui.util import taskbar
 from Cura.util import machineCom
 from Cura.util import gcodeInterpreter
 from Cura.util import power
@@ -118,8 +118,6 @@ class printWindow(wx.Frame):
                        if not self.cam.hasCamera():
                                self.cam = None
 
-               #self.SetIcon(icon.getMainIcon())
-
                self.SetSizer(wx.BoxSizer())
                self.panel = wx.Panel(self)
                self.GetSizer().Add(self.panel, 1, flag=wx.EXPAND)

diff --git a/Cura/gui/projectPlanner.py b/Cura/gui/projectPlanner.py
index 32a294576229eae5d17ad9aa861aa58a5d75a10f..f35d65fc6a33ab86b51c35d102e203c20bc747b8 100644 (file)
--- a/Cura/gui/projectPlanner.py
+++ b/Cura/gui/projectPlanner.py
@@ -20,12 +20,12 @@ except:
        print "Failed to find PyOpenGL: http://pyopengl.sourceforge.net/"
        hasOpenGLlibs = False
 
-from Cura.gui import opengl
-from Cura.gui import toolbarUtil
+from Cura.gui.util import opengl
+from Cura.gui.util import toolbarUtil
 from Cura.gui import configBase
 from Cura.gui import printWindow
-from Cura.gui import dropTarget
-from Cura.gui import taskbar
+from Cura.gui.util import dropTarget
+from Cura.gui.util import taskbar
 from Cura.util import validators
 from Cura.util import profile
 from Cura.util import util3d
@@ -149,8 +149,7 @@ class projectPlanner(wx.Frame):
                self.panel = wx.Panel(self, -1)
                self.SetSizer(wx.BoxSizer(wx.VERTICAL))
                self.GetSizer().Add(self.panel, 1, flag=wx.EXPAND)
-               #self.SetIcon(icon.getMainIcon())
-               
+
                self.SetDropTarget(dropTarget.FileDropTarget(self.OnDropFiles, meshLoader.supportedExtensions()))
                
                self.list = []

diff --git a/Cura/gui/simpleMode.py b/Cura/gui/simpleMode.py
index 87e63cacf50a332cc04e41a8f43c9ad5f35d6643..d17c0527f637bff517dec7b7e3eb659b22baef47 100644 (file)
--- a/Cura/gui/simpleMode.py
+++ b/Cura/gui/simpleMode.py
@@ -8,7 +8,7 @@ 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.util import dropTarget
 from Cura.gui import printWindow
 from Cura.util import profile
 from Cura.util import version
@@ -21,7 +21,6 @@ class simpleModeWindow(configBase.configWindowBase):
                super(simpleModeWindow, self).__init__(title='Cura - Quickprint - ' + version.getVersion())
                
                wx.EVT_CLOSE(self, self.OnClose)
-               #self.SetIcon(icon.getMainIcon())
 
                self.SetDropTarget(dropTarget.FileDropTarget(self.OnDropFiles, meshLoader.supportedExtensions()))
                

diff --git a/Cura/gui/sliceProgessPanel.py b/Cura/gui/sliceProgessPanel.py
index 091e444d6ad66eb1cbbbc1f46eba8392697be3ad..5669534c0ea8dc62f51cf480b470e17c721367fd 100644 (file)
--- a/Cura/gui/sliceProgessPanel.py
+++ b/Cura/gui/sliceProgessPanel.py
@@ -8,8 +8,8 @@ import time
 import re
 import platform
 
-from Cura.gui import taskbar
 from Cura.gui import preferencesDialog
+from Cura.gui.util import taskbar
 from Cura.util import profile
 from Cura.util import sliceRun
 from Cura.util import exporer

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

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

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

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

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

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

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