Move resources in to their own subdirectory and update the code that uses the resources.

Cura/gui/batchRun.py

@@ -1,6 +1,6 @@
 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

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/mainWindow.py

@@ -21,7 +21,6 @@ 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.util import validators
 from Cura.util import profile