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 f071f2dc5539025876c856248f1d8d5069b830ed..b252ad77a38e184a01b7526eb116031473dc0027 100644 (file)
--- 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 b49cca2a8f6cf22807c931191dd64b679a041c93..1e9ed86fff611821aef6a6d6d385a11957f96f47 100644 (file)
--- 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 3b9fcfbae50bebd2f36d7c180d78c45b82e74905..761f23c04ef2bf8e2c827f438de25e9285cd6c85 100644 (file)
--- 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