From: Youness Alaoui Date: Wed, 2 Sep 2015 18:15:51 +0000 (-0400) Subject: Add a full_name key to materials for displaying when all material types are selected X-Git-Tag: lulzbot-16.01~13 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=add4ed4acaa53682f51647819b1a45c6b6e61bef;p=cura.git Add a full_name key to materials for displaying when all material types are selected --- diff --git a/Cura/gui/simpleMode.py b/Cura/gui/simpleMode.py index f071f2dc..b252ad77 100644 --- a/Cura/gui/simpleMode.py +++ b/Cura/gui/simpleMode.py @@ -169,11 +169,12 @@ class simpleModePanel(wx.Panel): if selection >= len(self._print_material_types.keys()): materials = self._all_print_materials + for material in materials: + choices.append(material.full_name) else: materials = self._print_material_types[materialType] - - for material in materials: - choices.append(material.name) + for material in materials: + choices.append(material.name) # Decide on the default selected material selectedMaterial = None diff --git a/Cura/util/resources.py b/Cura/util/resources.py index b49cca2a..1e9ed86f 100644 --- a/Cura/util/resources.py +++ b/Cura/util/resources.py @@ -129,6 +129,9 @@ class ProfileIni(object): self.name = self._getProfileInfo(ini_file, 'name') if self.name is None: self.name = self.base_name + self.full_name = self._getProfileInfo(ini_file, 'full_name') + if self.full_name is None: + self.full_name = self.name # Finds the full path to the real profile_file self.profile_file = self._findProfileFile() # default = The default profile to select diff --git a/resources/quickprint/lulzbot_mini/PLA/material.ini b/resources/quickprint/lulzbot_mini/PLA/material.ini index 3b9fcfba..761f23c0 100644 --- a/resources/quickprint/lulzbot_mini/PLA/material.ini +++ b/resources/quickprint/lulzbot_mini/PLA/material.ini @@ -1,4 +1,5 @@ [info] name = PLA +full_name = eSun PLA order = 1 material_types = Beginner|eSun