From: daid <daid303@gmail.com>
Date: Fri, 16 May 2014 19:03:57 +0000 (+0200)
Subject: Add joris to the tooltips.
X-Git-Tag: 14.06~17
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=324c0f5217c42b4f9e12aab55934ab3833be5a81;p=cura.git

Add joris to the tooltips.
---

diff --git a/Cura/gui/mainWindow.py b/Cura/gui/mainWindow.py
index 6bf47fd1..be6a7824 100644
--- a/Cura/gui/mainWindow.py
+++ b/Cura/gui/mainWindow.py
@@ -465,6 +465,8 @@ class mainWindow(wx.Frame):
 			for line in f:
 				if line.startswith(';CURA_PROFILE_STRING:'):
 					profile.setProfileFromString(line[line.find(':')+1:].strip())
+					if ';{profile_string}' not in profile.getProfileSetting('end.gcode'):
+						profile.putProfileSetting('end.gcode', profile.getProfileSetting('end.gcode') + '\n;{profile_string}')
 					hasProfile = True
 			if hasProfile:
 				self.updateProfileToAllControls()
diff --git a/Cura/util/profile.py b/Cura/util/profile.py
index 3c6e2857..1e689e01 100644
--- a/Cura/util/profile.py
+++ b/Cura/util/profile.py
@@ -225,7 +225,7 @@ setting('support_angle', 60, float, 'expert', _('Support')).setRange(0,90).setLa
 setting('support_fill_rate', 15, int, 'expert', _('Support')).setRange(0,100).setLabel(_("Fill amount (%)"), _("Amount of infill structure in the support material, less material gives weaker support which is easier to remove. 15% seems to be a good average."))
 setting('support_xy_distance', 0.7, float, 'expert', _('Support')).setRange(0,10).setLabel(_("Distance X/Y (mm)"), _("Distance of the support material from the print, in the X/Y directions.\n0.7mm gives a nice distance from the print so the support does not stick to the print."))
 setting('support_z_distance', 0.15, float, 'expert', _('Support')).setRange(0,10).setLabel(_("Distance Z (mm)"), _("Distance from the top/bottom of the support to the print. A small gap here makes it easier to remove the support but makes the print a bit uglier.\n0.15mm gives a good seperation of the support material."))
-setting('spiralize', False, bool, 'expert', 'Spiralize').setLabel(_("Spiralize the outer contour"), _("Spiralize is smoothing out the Z move of the outer edge. This will create a steady Z increase over the whole print. This feature turns a solid object into a single walled print with a solid bottom."))
+setting('spiralize', False, bool, 'expert', 'Spiralize').setLabel(_("Spiralize the outer contour"), _("Spiralize is smoothing out the Z move of the outer edge. This will create a steady Z increase over the whole print. This feature turns a solid object into a single walled print with a solid bottom.\nThis feature used to be called Joris in older versions."))
 #setting('bridge_speed', 100, int, 'expert', 'Bridge').setRange(0,100).setLabel(_("Bridge speed (%)"), _("Speed at which layers with bridges are printed, compared to normal printing speed."))
 setting('brim_line_count', 20, int, 'expert', _('Brim')).setRange(1,100).setLabel(_("Brim line amount"), _("The amount of lines used for a brim, more lines means a larger brim which sticks better, but this also makes your effective print area smaller."))
 setting('raft_margin', 5.0, float, 'expert', _('Raft')).setRange(0).setLabel(_("Extra margin (mm)"), _("If the raft is enabled, this is the extra raft area around the object which is also rafted. Increasing this margin will create a stronger raft while using more material and leaving less area for your print."))