From 33d525c87ee2571b0e8b7c13199c5184aab788fa Mon Sep 17 00:00:00 2001
From: daid <daid303@gmail.com>
Date: Thu, 19 Sep 2013 08:20:01 +0200
Subject: [PATCH] Fix the usage stats submit. Some minor cleanup.

---
 Cura/gui/configBase.py   | 14 --------------
 Cura/gui/mainWindow.py   |  1 -
 Cura/util/profile.py     |  2 +-
 Cura/util/sliceEngine.py |  4 ++--
 4 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/Cura/gui/configBase.py b/Cura/gui/configBase.py
index f416bd45..6411d992 100644
--- a/Cura/gui/configBase.py
+++ b/Cura/gui/configBase.py
@@ -2,7 +2,6 @@ from __future__ import absolute_import
 from __future__ import division
 __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License"
 
-import platform
 import wx, wx.lib.stattext, types
 from wx.lib.agw import floatspin
 
@@ -252,16 +251,3 @@ class SettingRow(object):
 				pass
 		else:
 			self.ctrl.SetValue(value)
-
-#Settings notify works as a validator, but instead of validating anything, it calls another function, which can use the value.
-# A bit hacky, bit it works.
-class settingNotify(object):
-	def __init__(self, setting, func):
-		self.setting = setting
-		self.setting.validators.append(self)
-		self.func = func
-	
-	def validate(self):
-		self.func()
-		return validators.SUCCESS, ''
-
diff --git a/Cura/gui/mainWindow.py b/Cura/gui/mainWindow.py
index cdfee11c..df325045 100644
--- a/Cura/gui/mainWindow.py
+++ b/Cura/gui/mainWindow.py
@@ -21,7 +21,6 @@ from Cura.gui.tools import minecraftImport
 from Cura.util import profile
 from Cura.util import version
 from Cura.util import meshLoader
-from Cura.util import resources
 
 class mainWindow(wx.Frame):
 	def __init__(self):
diff --git a/Cura/util/profile.py b/Cura/util/profile.py
index e3853f91..4178fa66 100644
--- a/Cura/util/profile.py
+++ b/Cura/util/profile.py
@@ -527,7 +527,7 @@ def getProfileString():
 	ret = base64.b64encode(zlib.compress(ret, 9))
 	return ret
 
-def getGlobalPreferencesString():
+def getPreferencesString():
 	p = []
 	global settingsList
 	for set in settingsList:
diff --git a/Cura/util/sliceEngine.py b/Cura/util/sliceEngine.py
index 47bd5360..1b3efc1a 100644
--- a/Cura/util/sliceEngine.py
+++ b/Cura/util/sliceEngine.py
@@ -332,8 +332,8 @@ class Slicer(object):
 			'processor': platform.processor(),
 			'machine': platform.machine(),
 			'platform': platform.platform(),
-			'profile': profile.getGlobalProfileString(),
-			'preferences': profile.getGlobalPreferencesString(),
+			'profile': profile.getProfileString(),
+			'preferences': profile.getPreferencesString(),
 			'modelhash': self._modelHash,
 			'version': version.getVersion(),
 		}
-- 
2.30.2