Merge branch 'SteamEngine' of github.com:daid/Cura into SteamEngine

diff --git a/Cura/gui/configBase.py b/Cura/gui/configBase.py
index f416bd45f361f093518a4885470a5c2761c6cc7f..6411d9928b43c217977430ccbb5ef1175b1cdb25 100644 (file)
--- 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 cdfee11c2c5bca70d48788c8464709d6085f3f73..df3250455be97342823d1997d9b871faadc0832b 100644 (file)
--- 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 e3853f917861d013677a059af1f09949a81255ea..4178fa662bf3cec6277b450952ada3a79dfaca40 100644 (file)
--- 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 47bd5360c3279c351afa99588f9e655fb79fcf32..1b3efc1aa31fdc979e9a530dcd4e7d652bd1dd0e 100644 (file)
--- 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(),
                }