From 12638f3601eb95217a9ee74858f19a2ae1bca3ef Mon Sep 17 00:00:00 2001
From: fieldOfView <aldo@fieldofview.com>
Date: Fri, 13 May 2016 19:04:32 +0200
Subject: [PATCH] Make machine prefix for jobname optional

CURA-1480
---
 cura/CuraApplication.py       |  1 +
 resources/qml/GeneralPage.qml | 18 +++++++++++++++++-
 resources/qml/JobSpecs.qml    |  6 +++++-
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py
index f381faa482..996e1f59a3 100644
--- a/cura/CuraApplication.py
+++ b/cura/CuraApplication.py
@@ -114,6 +114,7 @@ class CuraApplication(QtApplication):
         Preferences.getInstance().addPreference("cura/active_mode", "simple")
         Preferences.getInstance().addPreference("cura/recent_files", "")
         Preferences.getInstance().addPreference("cura/categories_expanded", "")
+        Preferences.getInstance().addPreference("cura/jobname_prefix", True)
         Preferences.getInstance().addPreference("view/center_on_select", True)
         Preferences.getInstance().addPreference("mesh/scale_to_fit", True)
         Preferences.getInstance().addPreference("mesh/scale_tiny_meshes", True)
diff --git a/resources/qml/GeneralPage.qml b/resources/qml/GeneralPage.qml
index 3db56d4699..4f597ff32b 100644
--- a/resources/qml/GeneralPage.qml
+++ b/resources/qml/GeneralPage.qml
@@ -31,9 +31,11 @@ UM.PreferencesPage
         UM.Preferences.resetPreference("physics/automatic_push_free")
         UM.Preferences.resetPreference("mesh/scale_to_fit")
         UM.Preferences.resetPreference("info/send_slice_info")
+        UM.Preferences.resetPreference("cura/jobname_prefix")
         pushFreeCheckbox.checked = boolCheck(UM.Preferences.getValue("physics/automatic_push_free"))
         sendDataCheckbox.checked = boolCheck(UM.Preferences.getValue("info/send_slice_info"))
         scaleToFitCheckbox.checked = boolCheck(UM.Preferences.getValue("mesh/scale_to_fit"))
+        prefixJobNameCheckbox.checked = boolCheck(UM.Preferences.getValue("cura/jobname_prefix"))
         var defaultLanguage = UM.Preferences.getValue("general/language")
         setDefaultLanguage(defaultLanguage)
 
@@ -116,7 +118,7 @@ UM.PreferencesPage
         UM.TooltipArea {
             width: childrenRect.width
             height: childrenRect.height
-            text: catalog.i18nc("@info:tooltip", "Should objects on the platform be moved so that they no longer intersect.")
+            text: catalog.i18nc("@info:tooltip", "Should objects on the platform be moved so that they no longer intersect?")
 
             CheckBox
             {
@@ -183,5 +185,19 @@ UM.PreferencesPage
                 onCheckedChanged: UM.Preferences.setValue("info/send_slice_info", checked)
             }
         }
+
+        UM.TooltipArea {
+            width: childrenRect.width
+            height: childrenRect.height
+            text: catalog.i18nc("@info:tooltip", "Should a prefix based on the printer name be added to the print job name automatically?")
+
+            CheckBox
+            {
+                id: prefixJobNameCheckbox
+                text: catalog.i18nc("@option:check", "Add machine prefix to job name")
+                checked: boolCheck(UM.Preferences.getValue("cura/jobname_prefix"))
+                onCheckedChanged: UM.Preferences.setValue("cura/jobname_prefix", checked)
+            }
+        }
     }
 }
diff --git a/resources/qml/JobSpecs.qml b/resources/qml/JobSpecs.qml
index fac4fd841d..99b2d00c36 100644
--- a/resources/qml/JobSpecs.qml
+++ b/resources/qml/JobSpecs.qml
@@ -31,6 +31,7 @@ Rectangle {
     function createFileName(){
         var splitMachineName = UM.MachineManager.activeMachineInstance.split(" ")
         var abbrMachine = ''
+        if ((UM.Preferences.getValue("cura/jobname_prefix"))) {
             for (var i = 0; i < splitMachineName.length; i++){
                 if (splitMachineName[i].search(/ultimaker/i) != -1){
                     abbrMachine += 'UM'
@@ -48,7 +49,10 @@ Rectangle {
                     }
                 }
             }
-        printJobTextfield.text = abbrMachine + '_' + base.fileBaseName
+            printJobTextfield.text = abbrMachine + '_' + base.fileBaseName
+        } else {
+            printJobTextfield.text = base.fileBaseName
+        }
     }
 
      Connections {