Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Ultimaker/Cura.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorc.lamboo <casperlamboo@gmail.com>2022-04-08 16:55:34 +0300
committerc.lamboo <casperlamboo@gmail.com>2022-04-08 16:55:34 +0300
commit45bc498c7f2935601ee7baee4282b27dcad6533a (patch)
tree96c6903fe5bf0ff91f1657d64a06e1b614ce583a /plugins/UM3NetworkPrinting
parent3de824e1a47ddb4ae0fe1b837acdac075af4bccc (diff)
Replace `RecolorImage` with `ColorImage`
CURA-8640
Diffstat (limited to 'plugins/UM3NetworkPrinting')
-rw-r--r--plugins/UM3NetworkPrinting/resources/qml/CameraButton.qml2
-rw-r--r--plugins/UM3NetworkPrinting/resources/qml/MonitorBuildplateConfiguration.qml2
-rw-r--r--plugins/UM3NetworkPrinting/resources/qml/MonitorCarousel.qml8
-rw-r--r--plugins/UM3NetworkPrinting/resources/qml/MonitorIconExtruder.qml2
-rw-r--r--plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobPreview.qml14
-rw-r--r--plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml2
-rw-r--r--plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml2
7 files changed, 9 insertions, 23 deletions
diff --git a/plugins/UM3NetworkPrinting/resources/qml/CameraButton.qml b/plugins/UM3NetworkPrinting/resources/qml/CameraButton.qml
index 4458b48996..e95b9d7e0e 100644
--- a/plugins/UM3NetworkPrinting/resources/qml/CameraButton.qml
+++ b/plugins/UM3NetworkPrinting/resources/qml/CameraButton.qml
@@ -21,7 +21,7 @@ Button
color: parent.enabled ? (parent.hovered ? UM.Theme.getColor("monitor_card_hover") : "transparent") : UM.Theme.getColor("monitor_icon_disabled")
}
- UM.RecolorImage
+ UM.ColorImage
{
id: icon
anchors
diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorBuildplateConfiguration.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorBuildplateConfiguration.qml
index 60e3726a32..0bd57e76d8 100644
--- a/plugins/UM3NetworkPrinting/resources/qml/MonitorBuildplateConfiguration.qml
+++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorBuildplateConfiguration.qml
@@ -45,7 +45,7 @@ Item
radius: Math.floor(height / 2)
}
- UM.RecolorImage
+ UM.ColorImage
{
id: buildplateIcon
anchors.centerIn: parent
diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorCarousel.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorCarousel.qml
index df6748cc36..89c2edd9b5 100644
--- a/plugins/UM3NetworkPrinting/resources/qml/MonitorCarousel.qml
+++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorCarousel.qml
@@ -75,13 +75,11 @@ Item
contentItem: Item
{
anchors.fill: parent
- UM.RecolorImage
+ UM.ColorImage
{
anchors.centerIn: parent
width: 18 // TODO: Theme!
height: width // TODO: Theme!
- sourceSize.width: width // TODO: Theme!
- sourceSize.height: width // TODO: Theme!
color: UM.Theme.getColor("text")
source: UM.Theme.getIcon("ChevronSingleLeft")
}
@@ -154,13 +152,11 @@ Item
contentItem: Item
{
anchors.fill: parent
- UM.RecolorImage
+ UM.ColorImage
{
anchors.centerIn: parent
width: 18 // TODO: Theme!
height: width // TODO: Theme!
- sourceSize.width: width // TODO: Theme!
- sourceSize.height: width // TODO: Theme!
color: UM.Theme.getColor("text")
source: UM.Theme.getIcon("ChevronSingleRight")
}
diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorIconExtruder.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorIconExtruder.qml
index f22ac53298..4b1a7df607 100644
--- a/plugins/UM3NetworkPrinting/resources/qml/MonitorIconExtruder.qml
+++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorIconExtruder.qml
@@ -27,7 +27,7 @@ Item
height: size
width: size
- UM.RecolorImage
+ UM.ColorImage
{
id: icon
anchors.fill: parent
diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobPreview.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobPreview.qml
index cf2239201f..4b4b7a2a3a 100644
--- a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobPreview.qml
+++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobPreview.qml
@@ -38,7 +38,7 @@ Item
}
- UM.RecolorImage
+ UM.ColorImage
{
id: ultiBotImage
@@ -46,18 +46,13 @@ Item
color: UM.Theme.getColor("monitor_placeholder_image")
height: printJobPreview.height
source: "../svg/ultibot.svg"
- sourceSize
- {
- height: height
- width: width
- }
/* Since print jobs ALWAYS have an image url, we have to check if that image URL errors or
not in order to determine if we show the placeholder (ultibot) image instead. */
visible: printJob && previewImage.status == Image.Error
width: printJobPreview.width
}
- UM.RecolorImage
+ UM.ColorImage
{
id: overlayIcon
anchors.centerIn: printJobPreview
@@ -90,11 +85,6 @@ Item
}
return ""
}
- sourceSize
- {
- height: height
- width: width
- }
visible: source != ""
width: 0.5 * printJobPreview.width
}
diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml
index df701b1d1f..2bc20ae462 100644
--- a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml
+++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml
@@ -147,7 +147,7 @@ Item
color: UM.Theme.getColor("text_link")
text: catalog.i18nc("@label link to Connect and Cloud interfaces", "Manage printer")
}
- UM.RecolorImage
+ UM.ColorImage
{
id: externalLinkIcon
anchors
diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml
index 87b7cab83e..3fd500cfca 100644
--- a/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml
+++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml
@@ -40,7 +40,7 @@ Item
height: 18 * screenScaleFactor // TODO: Theme!
width: childrenRect.width
- UM.RecolorImage
+ UM.ColorImage
{
id: externalLinkIcon
anchors.verticalCenter: manageQueueLabel.verticalCenter