From 21d4cd8f9fff870bb29080b74295fd4cb7c9b984 Mon Sep 17 00:00:00 2001
From: Remco Burema <r.burema@ultimaker.com>
Date: Fri, 9 Nov 2018 13:44:42 +0100
Subject: [PATCH 1/2] Add Safety Data Sheet links to materials in Marketplace.
 [CURA-5922]

---
 .../qml/ToolboxCompatibilityChart.qml         | 29 ++++++++++++++-----
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml b/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml
index fd014d26e1..a1038fd6b2 100644
--- a/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml
+++ b/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml
@@ -11,7 +11,8 @@ Item
     id: base
 
     property var packageData
-    property var technicalDataSheetUrl: {
+    property var technicalDataSheetUrl:
+    {
         var link = undefined
         if ("Technical Data Sheet" in packageData.links)
         {
@@ -25,10 +26,16 @@ Item
         }
         return link
     }
+    property var safetyDataSheetUrl:
+    {
+        var sds_name = "safetyDataSheet"
+        return (sds_name in packageData.links) ? packageData.links[sds_name] : undefined
+    }
     anchors.topMargin: UM.Theme.getSize("default_margin").height
     height: visible ? childrenRect.height : 0
 
-    visible: packageData.type == "material" && (packageData.has_configs || technicalDataSheetUrl != undefined)
+    visible: packageData.type == "material" &&
+        (packageData.has_configs || technicalDataSheetUrl !== undefined || safetyDataSheetUrl !== undefined)
 
     Item
     {
@@ -163,23 +170,31 @@ Item
 
     Label
     {
-        id: technical_data_sheet
+        id: data_sheet_links
         anchors.top: combatibilityItem.bottom
         anchors.topMargin: UM.Theme.getSize("default_margin").height / 2
-        visible: base.technicalDataSheetUrl !== undefined
+        visible: base.technicalDataSheetUrl !== undefined || base.safetyDataSheetUrl !== undefined
         height: visible ? contentHeight : 0
         text:
         {
+            var result = ""
             if (base.technicalDataSheetUrl !== undefined)
             {
-                return "<a href='%1'>%2</a>".arg(base.technicalDataSheetUrl).arg("Technical Data Sheet")
+                result += "<a href='%1'>%2</a>".arg(base.technicalDataSheetUrl).arg("Technical Data Sheet")
             }
-            return ""
+            if (base.safetyDataSheetUrl !== undefined)
+            {
+                if (result.length > 0)
+                {
+                    result += "<br/>"
+                }
+                result += "<a href='%1'>%2</a>".arg(base.safetyDataSheetUrl).arg("Safety Data Sheet")
+            }
+            return result
         }
         font: UM.Theme.getFont("very_small")
         color: UM.Theme.getColor("text")
         linkColor: UM.Theme.getColor("text_link")
         onLinkActivated: Qt.openUrlExternally(link)
     }
-
 }

From c8d9ad37ffc0b56dbedd35a72aa80f0fd0210209 Mon Sep 17 00:00:00 2001
From: Remco Burema <r.burema@ultimaker.com>
Date: Fri, 9 Nov 2018 13:49:14 +0100
Subject: [PATCH 2/2] Add Printing Guidelines links to materials in
 Marketplace. [CURA-5922]

---
 .../qml/ToolboxCompatibilityChart.qml         | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml b/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml
index a1038fd6b2..c6dd2217da 100644
--- a/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml
+++ b/plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml
@@ -31,11 +31,17 @@ Item
         var sds_name = "safetyDataSheet"
         return (sds_name in packageData.links) ? packageData.links[sds_name] : undefined
     }
+    property var printingGuidelinesUrl:
+    {
+        var pg_name = "printingGuidelines"
+        return (pg_name in packageData.links) ? packageData.links[pg_name] : undefined
+    }
     anchors.topMargin: UM.Theme.getSize("default_margin").height
     height: visible ? childrenRect.height : 0
 
     visible: packageData.type == "material" &&
-        (packageData.has_configs || technicalDataSheetUrl !== undefined || safetyDataSheetUrl !== undefined)
+        (packageData.has_configs || technicalDataSheetUrl !== undefined ||
+            safetyDataSheetUrl !== undefined || printingGuidelinesUrl !== undefined)
 
     Item
     {
@@ -173,7 +179,8 @@ Item
         id: data_sheet_links
         anchors.top: combatibilityItem.bottom
         anchors.topMargin: UM.Theme.getSize("default_margin").height / 2
-        visible: base.technicalDataSheetUrl !== undefined || base.safetyDataSheetUrl !== undefined
+        visible: base.technicalDataSheetUrl !== undefined ||
+            base.safetyDataSheetUrl !== undefined || base.printingGuidelinesUrl !== undefined
         height: visible ? contentHeight : 0
         text:
         {
@@ -190,6 +197,14 @@ Item
                 }
                 result += "<a href='%1'>%2</a>".arg(base.safetyDataSheetUrl).arg("Safety Data Sheet")
             }
+            if (base.printingGuidelinesUrl !== undefined)
+            {
+                if (result.length > 0)
+                {
+                    result += "<br/>"
+                }
+                result += "<a href='%1'>%2</a>".arg(base.printingGuidelinesUrl).arg("Printing Guidelines")
+            }
             return result
         }
         font: UM.Theme.getFont("very_small")