adding svg logos

MatterControlLib/DesignTools/Interfaces/Object3DUiWindowManager.cs

@@ -59,7 +59,7 @@ namespace MatterHackers.MatterControl.DesignTools
                 this.controlLayer = controlLayer;
                 this.item = item;
                 var theme = ApplicationController.Instance.Theme;
-                WindowWidget = new WindowWidget(theme, new RectangleDouble(10, 10, 700, 750))
+                WindowWidget = new WindowWidget(theme, new RectangleDouble(10, 10, 800, 750))
                 {
                     BackgroundColor = theme.BackgroundColor.WithAlpha(200),
                 };

StaticData/Svgs/MH Logo.svg

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg id="Layer_1" data-name="Layer 1" viewBox="0 0 1920 1080" xmlns="http://www.w3.org/2000/svg">
+  <polygon points="1092.41 561.54 957.11 639.07 778.61 536 778.61 329.9 957.11 226.85 1135.58 329.9 1135.58 459.08 1168.39 459.08 1168.39 310.96 957.11 189 745.82 310.96 745.82 554.92 957.11 676.92 1109.36 589.65 1092.41 561.54"/>
+  <path d="M1175.17,528.62a25.88,25.88,0,1,1-26.53-25.21h0a25.93,25.93,0,0,1,26.49,25.21"/>
+  <polygon points="914.33 418.41 940.85 495.99 945.93 495.99 968.28 495.99 973.36 495.99 999.88 418.41 999.88 495.99 1028.21 495.99 1028.21 369.97 999.88 369.97 988.41 369.97 957.07 462.78 925.79 369.97 914.33 369.97 885.97 369.97 885.97 495.99 914.33 495.99 914.33 418.41"/>
+</svg>

StaticData/Svgs/MatterHackers.svg

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg id="Layer_1" data-name="Layer 1" viewBox="0 0 1920 1080" xmlns="http://www.w3.org/2000/svg">
+  <path d="M416.35,760h35.54a.64.64,0,0,1,.59.45l18,64c4.48,16.15,8.07,34.64,8.07,34.64h.36s3.41-18.49,7.9-34.64l18-64a.61.61,0,0,1,.58-.45h36.08a.61.61,0,0,1,.61.61V887.7a.61.61,0,0,1-.61.61h-23a.6.6,0,0,1-.6-.6h0v-73c0-10.41,1.07-26.56,1.07-26.56h-.36s-2.87,15.07-5.56,24.41l-21.95,75.29a.6.6,0,0,1-.58.44h-24a.6.6,0,0,1-.58-.44L444.5,812.55c-2.7-9.34-5.57-24.41-5.57-24.41h-.36s1.08,16.15,1.08,26.56v73a.61.61,0,0,1-.61.61H416.35a.61.61,0,0,1-.61-.61V760.6A.62.62,0,0,1,416.35,760Z"/>
+  <path d="M611.17,878.08h-.35c-4.67,7-11.31,12.38-27.1,12.38-18.85,0-32.13-9.87-32.13-28.17,0-20.28,16.51-26.74,37-29.61,15.26-2.16,22.26-3.41,22.26-10.41,0-6.64-5.21-10.95-15.44-10.95-11.24,0-16.81,3.95-17.71,12.37a.61.61,0,0,1-.6.55H556.55a.6.6,0,0,1-.61-.59v0c1-15.89,13.06-29.69,39.62-29.69,27.64,0,38.76,12.39,38.76,33.92v46.84c0,6.75,1,10.83,3,12.56a.63.63,0,0,1,.23.47h0a.61.61,0,0,1-.61.61h-22.6a.6.6,0,0,1-.49-.25C612.53,886.14,611.69,882,611.17,878.08Zm.18-22.25V843a.6.6,0,0,0-.59-.61.59.59,0,0,0-.29.07c-4.3,2.22-10.46,3.56-16.16,4.9-12.75,2.87-19,5.74-19,14.36s5.75,11.66,14.36,11.66C603.64,873.41,611.35,864.8,611.35,855.83Z"/>
+  <path d="M734.41,870.36c-5.39,0-9.16-2.33-9.16-9.15V813a.62.62,0,0,1,.61-.6h14.58a.63.63,0,0,0,.61-.61V796.85a.62.62,0,0,0-.61-.6H725.86a.63.63,0,0,1-.61-.61v-27.5a.6.6,0,0,0-.59-.61h0L702,771.09a.6.6,0,0,0-.6.6h0v23.94a.63.63,0,0,1-.61.61H674.54a.61.61,0,0,1-.61-.61v-27.5a.61.61,0,0,0-.61-.61l-22.65,3.05a.61.61,0,0,0-.61.61v24.45a.61.61,0,0,1-.61.61H637.93a.6.6,0,0,0-.61.59h0v14.94a.61.61,0,0,0,.61.61h11.52a.6.6,0,0,1,.61.59h0v53.41c0,17.41,13.1,22.08,25,22.08,7.87,0,13-.24,14.68-.33a.61.61,0,0,0,.57-.61V870.82a.6.6,0,0,0-.59-.61h0c-1.27,0-4.22.15-6.55.15-5.38,0-9.15-2.33-9.15-9.15V813a.6.6,0,0,1,.6-.6h26.25a.62.62,0,0,1,.61.6v53.41c0,17.41,13.1,22.08,24.94,22.08,7.88,0,13-.24,14.68-.33a.61.61,0,0,0,.57-.61V870.82a.6.6,0,0,0-.59-.61h0C739.68,870.26,736.73,870.36,734.41,870.36Z"/>
+  <path d="M741.19,842.19c0-27.28,18.48-48.46,45.4-48.46,29.43,0,45.21,22.33,45.4,54.84a.61.61,0,0,1-.6.62H765.93a.61.61,0,0,0-.61.61s0,.06,0,.08c2,13.77,9.82,22.28,23.41,22.28,9.34,0,14.87-4.15,17.62-10.93a.6.6,0,0,1,.56-.38H829.8a.61.61,0,0,1,.61.61.57.57,0,0,1,0,.13c-3.69,16-18.15,29.41-41.48,29.41C758.42,891,741.19,869.64,741.19,842.19Zm25.14-9.87h39.52a.61.61,0,0,0,.61-.61v-.05c-1-11.31-8.59-19.08-19.51-19.08-12.66,0-19,7.4-21.22,19a.62.62,0,0,0,.49.73Z"/>
+  <path d="M861.1,811h.54c5.56-10.41,11.85-15.79,22.61-15.79a17,17,0,0,1,5.31.57.61.61,0,0,1,.44.58v20.92h-.57c-16-1.6-27.43,6.83-27.43,26.2V887.7a.61.61,0,0,1-.61.61H838.2a.61.61,0,0,1-.61-.61V796.85a.62.62,0,0,1,.61-.6h22.29a.6.6,0,0,1,.61.59h0Z"/>
+  <path d="M898,760h24.8a.61.61,0,0,1,.61.61v49a.61.61,0,0,0,.61.61h49.21a.61.61,0,0,0,.61-.61v-49a.61.61,0,0,1,.61-.61h24.8a.61.61,0,0,1,.61.61V887.7a.61.61,0,0,1-.61.61h-24.8a.61.61,0,0,1-.61-.61V832.39a.61.61,0,0,0-.61-.61H924.05a.61.61,0,0,0-.61.61V887.7a.61.61,0,0,1-.61.61H898a.61.61,0,0,1-.61-.61V760.6A.62.62,0,0,1,898,760Z"/>
+  <path d="M1066,878.08h-.36c-4.67,7-11.31,12.38-27.1,12.38-18.84,0-32.12-9.87-32.12-28.17,0-20.28,16.51-26.74,37-29.61,15.25-2.16,22.25-3.41,22.25-10.41,0-6.64-5.21-10.95-15.43-10.95-11.25,0-16.82,3.95-17.72,12.37a.61.61,0,0,1-.6.55H1011.4a.61.61,0,0,1-.61-.61v0c1-15.89,13.07-29.69,39.63-29.69,27.63,0,38.76,12.39,38.76,33.92v46.84c0,6.75,1,10.83,3,12.56a.63.63,0,0,1,.23.47h0a.61.61,0,0,1-.61.61h-22.59a.6.6,0,0,1-.49-.25C1067.34,886.14,1066.49,882,1066,878.08Zm.18-22.25V843a.6.6,0,0,0-.62-.6.58.58,0,0,0-.26.06c-4.3,2.22-10.47,3.56-16.17,4.9-12.74,2.87-19,5.74-19,14.36s5.74,11.66,14.35,11.66c14,0,21.68-8.58,21.68-17.55Z"/>
+  <path d="M1095.19,842.37c0-27.46,18-48.64,45.94-48.64,23.59,0,38.23,13.49,41.7,33a.61.61,0,0,1-.52.7h-22.74a.6.6,0,0,1-.59-.48c-1.77-7.83-8-13.7-16.77-13.7-14.71,0-22.25,11.31-22.25,29.08,0,17.4,7,29.07,21.89,29.07,9.71,0,16.64-5,18.4-15.11a.6.6,0,0,1,.6-.5h22.33a.62.62,0,0,1,.61.63v0c-1.91,19.25-17.09,34.51-41.4,34.51C1113.32,891,1095.19,869.82,1095.19,842.37Z"/>
+  <path d="M1224.61,846.88l-9.87,10.2a.63.63,0,0,0-.17.43V887.7a.61.61,0,0,1-.61.61h-23a.61.61,0,0,1-.61-.61V764.16a.63.63,0,0,1,.61-.61l23-3.56a.61.61,0,0,1,.61.61v68.92a.61.61,0,0,0,.66.56.64.64,0,0,0,.34-.14l31.43-33.5a.64.64,0,0,1,.45-.19H1275a.61.61,0,0,1,.57.65.64.64,0,0,1-.14.35l-32.57,33.61a.6.6,0,0,0-.07.76L1280,887.36a.61.61,0,0,1-.17.85.67.67,0,0,1-.34.1h-28.13a.61.61,0,0,1-.52-.29l-25.25-41a.61.61,0,0,0-1-.14Z"/>
+  <path d="M1273.11,842.19c0-27.28,18.48-48.46,45.4-48.46,29.43,0,45.21,22.33,45.4,54.84a.61.61,0,0,1-.6.62h-65.45a.62.62,0,0,0-.62.6s0,.06,0,.09c2,13.77,9.83,22.28,23.42,22.28,9.33,0,14.86-4.15,17.61-10.93a.6.6,0,0,1,.56-.38h22.88a.61.61,0,0,1,.61.61.57.57,0,0,1,0,.13c-3.69,16-18.15,29.41-41.47,29.41C1290.34,891,1273.11,869.64,1273.11,842.19Zm25.14-9.87h39.52a.61.61,0,0,0,.61-.61v-.05c-1-11.31-8.59-19.08-19.51-19.08-12.66,0-18.94,7.4-21.22,19a.62.62,0,0,0,.49.73Z"/>
+  <path d="M1394.57,811h.53c5.57-10.41,11.85-15.79,22.62-15.79a17.29,17.29,0,0,1,5.31.57.61.61,0,0,1,.43.58v20.92h-.57c-16-1.6-27.43,6.83-27.43,26.2V887.7a.6.6,0,0,1-.59.61h-23.2a.61.61,0,0,1-.61-.61V796.85a.6.6,0,0,1,.6-.6H1394a.62.62,0,0,1,.61.6Z"/>
+  <path d="M1424.09,858.52h21.43a.6.6,0,0,1,.6.51c1.78,10.23,9.25,14.74,20,14.74s16.86-4.13,16.86-10.59c0-8.79-11.66-9.69-24.22-12.2-16.51-3.23-32.66-7.72-32.66-27.82,0-19.92,16.51-29.43,37.5-29.43,23.93,0,37.36,11.73,39.41,29.83a.62.62,0,0,1-.54.68h-20.92a.6.6,0,0,1-.6-.53c-1.25-9.47-7.49-12.93-17.71-12.93-9.51,0-15.79,3.59-15.79,10.23,0,7.9,12.21,8.61,25.3,11.31,15.44,3.23,32.49,7.53,32.49,29.07,0,18.48-15.8,29.61-38.77,29.61-26.43,0-41.29-12.63-43-31.82a.61.61,0,0,1,.56-.66Z"/>
+</svg>

StaticData/Translations/Master.txt

@@ -3922,9 +3922,15 @@ Translated:Print Queue
 English:Print Recovery
 Translated:Print Recovery
 
+English:Print Sku
+Translated:Print Sku
+
 English:Print the inventory labels for this ID.
 Translated:Print the inventory labels for this ID.
 
+English:Print the SKU label for this ID.
+Translated:Print the SKU label for this ID.
+
 English:Print Time
 Translated:Print Time
 

Submodules/agg-sharp

@@ -1 +1 @@
-Subproject commit 36e59e5af61640c7045ec9f8a37fd6033c55c100
+Subproject commit 4cec2340ebc82909e9202efb6b09e72e1d3042cd