From 70f7f68a517dfaa2878cf5ae6e0f76b027eebf3f Mon Sep 17 00:00:00 2001
From: Joey de l'Arago <joeydelarago@gmail.com>
Date: Thu, 17 Nov 2022 13:01:20 +0100
Subject: [PATCH] Color icons in workspace dialog so they are themed correctly
 in dark mode.

Don't show name when defaulting to create new printer.

CURA-9424
---
 plugins/3MFReader/WorkspaceDialog.qml  | 2 +-
 plugins/3MFReader/WorkspaceSection.qml | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/3MFReader/WorkspaceDialog.qml b/plugins/3MFReader/WorkspaceDialog.qml
index 221696a571..c0128ab4de 100644
--- a/plugins/3MFReader/WorkspaceDialog.qml
+++ b/plugins/3MFReader/WorkspaceDialog.qml
@@ -96,7 +96,7 @@ UM.Dialog
                         WorkspaceRow
                         {
                             leftLabelText: catalog.i18nc("@action:label", manager.isPrinterGroup ? "Printer Group" : "Printer Name")
-                            rightLabelText: manager.machineName
+                            rightLabelText: manager.machineName == "Create new" ? "" : manager.machineName
                         }
                     }
 
diff --git a/plugins/3MFReader/WorkspaceSection.qml b/plugins/3MFReader/WorkspaceSection.qml
index 6eb8f50bdf..0c94ab5d6a 100644
--- a/plugins/3MFReader/WorkspaceSection.qml
+++ b/plugins/3MFReader/WorkspaceSection.qml
@@ -36,6 +36,7 @@ Item
             anchors.verticalCenter: parent.verticalCenter
             source: ""
             height: UM.Theme.getSize("medium_button_icon").height
+            color: UM.Theme.getColor("text")
             width: height
         }
         UM.Label
@@ -95,6 +96,7 @@ Item
 
                 visible: comboboxTooltipText != ""
                 source: UM.Theme.getIcon("Help")
+                color: UM.Theme.getColor("text")
 
                 UM.ToolTip
                 {