Merge branch 'script' of github.com:brunohenriquy/Cura

plugins/PostProcessingPlugin/scripts/DisplayFilenameAndLayerOnLCD.py

@@ -4,10 +4,12 @@
 # Modified: November 16, 2018 by Joshua Pope-Lewis
 
 # Description:  This plugin shows custom messages about your print on the Status bar...
-#               Please look at the 3 options
+#               Please look at the 5 options
 #               - Scrolling (SCROLL_LONG_FILENAMES) if enabled in Marlin and you aren't printing a small item select this option.
 #               - Name: By default it will use the name generated by Cura (EG: TT_Test_Cube) - Type a custom name in here
+#               - Start Num: Choose which number you prefer for the initial layer, 0 or 1
 #               - Max Layer: Enabling this will show how many layers are in the entire print (EG: Layer 1 of 265!)
+#               - Add prefix 'Printing': Enabling this will add the prefix 'Printing'
 
 from ..Script import Script
 from UM.Application import Application
@@ -53,23 +55,30 @@ class DisplayFilenameAndLayerOnLCD(Script):
                     "description": "Display how many layers are in the entire print on status bar?",
                     "type": "bool",
                     "default_value": true
-                }
+                },
+                "addPrefixPrinting":
+                {
+                    "label": "Add prefix 'Printing'?",
+                    "description": "This will add the prefix 'Printing'",
+                    "type": "bool",
+                    "default_value": true
+                },
             }
         }"""
 
     def execute(self, data):
         max_layer = 0
+        lcd_text = "M117 "
         if self.getSettingValueByKey("name") != "":
             name = self.getSettingValueByKey("name")
         else:
             name = Application.getInstance().getPrintInformation().jobName
+        if self.getSettingValueByKey("addPrefixPrinting"):
+            lcd_text += "Printing "
         if not self.getSettingValueByKey("scroll"):
-            if self.getSettingValueByKey("maxlayer"):
-                lcd_text = "M117 Layer "
-            else:
-                lcd_text = "M117 Printing Layer "
+            lcd_text += "Layer "
         else:
-            lcd_text = "M117 Printing " + name + " - Layer "
+            lcd_text += name + " - Layer "
         i = self.getSettingValueByKey("startNum")
         for layer in data:
             display_text = lcd_text + str(i)