From: Youness Alaoui <kakaroto@kakaroto.homelinux.net>
Date: Tue, 20 Jan 2015 18:48:11 +0000 (-0500)
Subject: Merge branch 'upstream'
X-Git-Tag: lulzbot-15.02.1-1.01~75^2~5
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=2f894755ed89ae77e4d3b88c66feb4936436ba7d;p=cura.git

Merge branch 'upstream'

Conflicts:
	Cura/gui/aboutWindow.py
	Cura/gui/preferencesDialog.py
	Cura/util/profile.py
---

2f894755ed89ae77e4d3b88c66feb4936436ba7d
diff --cc Cura/gui/aboutWindow.py
index ccd105df,7888f5f6..51c34848
--- a/Cura/gui/aboutWindow.py
+++ b/Cura/gui/aboutWindow.py
@@@ -4,8 -4,8 +4,8 @@@ import w
  import platform
  
  class aboutWindow(wx.Frame):
 -	def __init__(self):
 -		super(aboutWindow, self).__init__(None, title=_("About"), style = wx.DEFAULT_DIALOG_STYLE)
 +	def __init__(self, parent):
- 		super(aboutWindow, self).__init__(parent, title="About", style = wx.DEFAULT_DIALOG_STYLE)
++		super(aboutWindow, self).__init__(parent, title=_("About"), style = wx.DEFAULT_DIALOG_STYLE)
  
  		wx.EVT_CLOSE(self, self.OnClose)
  
diff --cc Cura/gui/configBase.py
index a9bbbea9,25f27764..f45fe157
--- a/Cura/gui/configBase.py
+++ b/Cura/gui/configBase.py
@@@ -160,9 -161,13 +161,14 @@@ class SettingRow(object)
  			self.ctrl.Bind(wx.EVT_TEXT, self.OnSettingChange)
  			flag = wx.EXPAND
  
 +		self.ctrl.Bind(wx.EVT_ENTER_WINDOW, self.OnMouseEnter)
  		sizer.Add(self.label, (x,y), flag=wx.ALIGN_CENTER_VERTICAL|wx.LEFT,border=10)
- 		sizer.Add(self.ctrl, (x,y+1), flag=wx.ALIGN_BOTTOM|flag)
+ 		sizer.Add(self.ctrl, (x,y+1), flag=wx.ALIGN_CENTER_VERTICAL|flag)
+ 		if self.setting.getExpertSubCategory() is not None:
+ 			self._expert_button = wx.Button(panel, -1, '...', style=wx.BU_EXACTFIT)
+ 			self._expert_button.SetFont(wx.Font(wx.SystemSettings.GetFont(wx.SYS_ANSI_VAR_FONT).GetPointSize() * 0.8, wx.FONTFAMILY_DEFAULT, wx.NORMAL, wx.FONTWEIGHT_NORMAL))
+ 			self._expert_button.Bind(wx.EVT_BUTTON, self.OnExpertOpen)
+ 			sizer.Add(self._expert_button, (x,y+2), flag=wx.ALIGN_CENTER_VERTICAL)
  		sizer.SetRows(x+1)
  
  		self.ctrl.Bind(wx.EVT_ENTER_WINDOW, self.OnMouseEnter)
diff --cc Cura/gui/preferencesDialog.py
index 6148b3b6,113dbf55..9a0d65c9
--- a/Cura/gui/preferencesDialog.py
+++ b/Cura/gui/preferencesDialog.py
@@@ -11,7 -11,7 +11,7 @@@ from Cura.util import resource
  
  class preferencesDialog(wx.Dialog):
  	def __init__(self, parent):
- 		super(preferencesDialog, self).__init__(parent, title="Preferences")
 -		super(preferencesDialog, self).__init__(None, title=_("Preferences"))
++		super(preferencesDialog, self).__init__(parent, title=_("Preferences"))
  
  		wx.EVT_CLOSE(self, self.OnClose)
  
@@@ -65,7 -65,7 +65,7 @@@
  
  class machineSettingsDialog(wx.Dialog):
  	def __init__(self, parent):
- 		super(machineSettingsDialog, self).__init__(parent, title="Machine settings")
 -		super(machineSettingsDialog, self).__init__(None, title=_("Machine settings"))
++		super(machineSettingsDialog, self).__init__(parent, title=_("Machine settings"))
  
  		wx.EVT_CLOSE(self, self.OnClose)
  
diff --cc Cura/gui/printWindow.py
index 74be922d,6356df64..c5a73f42
--- a/Cura/gui/printWindow.py
+++ b/Cura/gui/printWindow.py
@@@ -505,9 -499,15 +505,15 @@@ class printWindowBasic(wx.Frame)
  		self.statsText.SetLabel(info)
  		if connection.isPrinting() != self._isPrinting:
  			self._isPrinting = connection.isPrinting()
 -			preventComputerFromSleeping(self._isPrinting)
 +			preventComputerFromSleeping(self, self._isPrinting)
  
  
+ 	def _addTermLog(self, msg):
+ 		pass
+ 
+ 	def _addTermLog(self, msg):
+ 		pass
+ 
  	def _updateButtonStates(self):
  		self.connectButton.Show(self._printerConnection.hasActiveConnection())
  		self.connectButton.Enable(not self._printerConnection.isActiveConnectionOpen() and not self._printerConnection.isActiveConnectionOpening())
diff --cc Cura/util/profile.py
index 0c25bb00,ec84bb4b..93572c27
--- a/Cura/util/profile.py
+++ b/Cura/util/profile.py
@@@ -509,7 -520,6 +520,8 @@@ setting('extruder_offset_x2', '0.0', fl
  setting('extruder_offset_y2', '0.0', float, 'machine', 'hidden').setLabel(_("Offset Y"), _("The offset of your tertiary extruder compared to the primary."))
  setting('extruder_offset_x3', '0.0', float, 'machine', 'hidden').setLabel(_("Offset X"), _("The offset of your forth extruder compared to the primary."))
  setting('extruder_offset_y3', '0.0', float, 'machine', 'hidden').setLabel(_("Offset Y"), _("The offset of your forth extruder compared to the primary."))
 +setting('extruder_z_offset', '0.0', float, 'machine', 'hidden').setLabel(_("Z-Offset (mm)"), _("This value will be added to the Z coordinate of every line in the output G-Code to compensate for a badly calibrate Z height endstop."))
++
  setting('steps_per_e', '0', float, 'machine', 'hidden').setLabel(_("E-Steps per 1mm filament"), _("Amount of steps per mm filament extrusion. If set to 0 then this value is ignored and the value in your firmware is used."))
  setting('serial_port', 'AUTO', str, 'machine', 'hidden').setLabel(_("Serial port"), _("Serial port to use for communication with the printer"))
  setting('serial_port_auto', '', str, 'machine', 'hidden')