Merge remote-tracking branch 'upstream/master'

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):

Cura/gui/batchRun.py

@@ -1,11 +1,11 @@
 from __future__ import absolute_import
 
-import wx, os, platform, types, webbrowser, math, subprocess, multiprocessing, threading, time, re, shutil
+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()

Cura/gui/configBase.py

@@ -1,6 +1,6 @@
 from __future__ import absolute_import
 
-import wx, wx.lib.stattext, os, sys, platform, types
+import wx, wx.lib.stattext, types
 
 from Cura.util import validators
 from Cura.util import profile

Cura/gui/firmwareInstall.py

@@ -8,13 +8,14 @@ from Cura.avr_isp import intelHex
 
 from Cura.util import machineCom
 from Cura.util import profile
+from Cura.util import resources
 
 def getDefaultFirmware():
 	if profile.getPreference('machine_type') == 'ultimaker':
 		if sys.platform.startswith('linux'):
-			return os.path.join(os.path.dirname(os.path.abspath(__file__)), "../firmware/ultimaker_115200.hex")
+			return resources.getPathForFirmware("ultimaker_115200.hex")
 		else:
-			return os.path.join(os.path.dirname(os.path.abspath(__file__)), "../firmware/ultimaker_250000.hex")
+			return resources.getPathForFirmware("ultimaker_250000.hex")
 	return None
 
 class InstallFirmware(wx.Dialog):

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)
 

Cura/gui/icon.py

@@ -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
-

Cura/gui/mainWindow.py

@@ -21,8 +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 icon
-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
@@ -58,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()))
 

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

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)

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 = []

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()))
 		

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