3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-23 22:54:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Replace RecolorImage with ColorImage

Browse source 
CURA-8640
This commit is contained in:
c.lamboo 2022-04-08 15:55:34 +02:00
parent 3de824e1a4
commit 45bc498c7f
64 changed files with 88 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/3MFReader/WorkspaceDialog.qml
View file

@ -426,7 +426,7 @@ UM.Dialog
width: parent.width
height: childrenRect.height
visible: manager.hasObjectsOnPlate
UM.RecolorImage
UM.ColorImage
{
width: warningLabel.height
height: width

2
plugins/CuraDrive/src/qml/components/BackupListItemDetailsRow.qml
View file

@ -17,7 +17,7 @@ RowLayout
property alias label: detailName.text
property alias value: detailValue.text
UM.RecolorImage
UM.ColorImage
{
id: icon
width: 18 * screenScaleFactor

2
plugins/DigitalLibrary/resources/qml/LoadMoreProjectsCard.qml
View file

@ -30,7 +30,7 @@ Cura.RoundedRectangle
anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter
UM.RecolorImage
UM.ColorImage
{
id: projectImage
anchors.verticalCenter: parent.verticalCenter

2
plugins/Marketplace/resources/qml/LicenseDialog.qml
View file

@ -33,7 +33,7 @@ UM.Dialog
spacing: UM.Theme.getSize("default_margin").width
leftPadding: UM.Theme.getSize("narrow_margin").width
UM.RecolorImage
UM.ColorImage
{
id: icon
width: UM.Theme.getSize("marketplace_large_icon").width

2
plugins/Marketplace/resources/qml/ManageButton.qml
View file

@ -46,7 +46,7 @@ Item
height: UM.Theme.getSize("action_button").height
width: childrenRect.width
UM.RecolorImage
UM.ColorImage
{
id: busyIndicator
visible: parent.visible

2
plugins/Marketplace/resources/qml/ManagePackagesButton.qml
View file

@ -33,7 +33,7 @@ TabButton
visible: root.hovered
}
UM.RecolorImage
UM.ColorImage
{
id: icon

2
plugins/Marketplace/resources/qml/Marketplace.qml
View file

@ -251,7 +251,7 @@ Window
margins: UM.Theme.getSize("default_margin").width
}
spacing: UM.Theme.getSize("default_margin").width
UM.RecolorImage
UM.ColorImage
{
id: bannerIcon
source: UM.Theme.getIcon("Plugin")

2
plugins/Marketplace/resources/qml/OnboardBanner.qml
View file

@ -20,7 +20,7 @@ Rectangle
color: UM.Theme.getColor("action_panel_secondary")
// Icon
UM.RecolorImage
UM.ColorImage
{
id: onboardingIcon
anchors

6
plugins/Marketplace/resources/qml/PackageCardHeader.qml
View file

@ -47,12 +47,10 @@ Item
sourceSize.width: width
}
UM.RecolorImage
UM.ColorImage
{
visible: !parent.packageHasIcon
anchors.fill: parent
sourceSize.height: height
sourceSize.width: width
color: UM.Theme.getColor("text")
source:
{
@ -123,7 +121,7 @@ Item
Layout.preferredWidth: UM.Theme.getSize("card_tiny_icon").width + 2 * padding
Layout.preferredHeight: UM.Theme.getSize("card_tiny_icon").width + 2 * padding
contentItem: UM.RecolorImage
contentItem: UM.ColorImage
{
source: UM.Theme.getIcon("LinkExternal")
color: UM.Theme.getColor("icon")

2
plugins/Marketplace/resources/qml/PackagePage.qml
View file

@ -46,7 +46,7 @@ Rectangle
// But we re-use the package page for the manage plugins as well. The one user that doesn't see
// the num downloads is an acceptable "sacrifice" to make this easy to fix.
visible: packageData.downloadCount != "0"
UM.RecolorImage
UM.ColorImage
{
id: downloadsIcon
width: UM.Theme.getSize("card_tiny_icon").width

2
plugins/Marketplace/resources/qml/Packages.qml
View file

@ -213,7 +213,7 @@ ListView
status: UM.StatusIcon.Status.ERROR
visible: false
}
UM.RecolorImage
UM.ColorImage
{
id: loadMoreIcon
anchors.fill: parent

2
plugins/Marketplace/resources/qml/VerifiedIcon.qml
View file

@ -32,7 +32,7 @@ Control
anchors.fill: parent
color: UM.Theme.getColor("action_button_hovered")
radius: width
UM.RecolorImage
UM.ColorImage
{
anchors.fill: parent
color: UM.Theme.getColor("primary")

2
plugins/MonitorStage/MonitorMain.qml
View file

@ -123,7 +123,7 @@ Rectangle
visible: !isNetworkConfigured && isNetworkConfigurable
width: childrenRect.width
UM.RecolorImage
UM.ColorImage
{
id: externalLinkIcon
anchors.verticalCenter: parent.verticalCenter

11
plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
View file

@ -79,7 +79,7 @@ Item
{
id: normalButton
text: catalog.i18nc("@label", "Normal model")
toolItem: UM.RecolorImage
toolItem: UM.ColorImage
{
source: UM.Theme.getIcon("Infill0")
color: UM.Theme.getColor("icon")
@ -94,7 +94,7 @@ Item
{
id: supportMeshButton
text: catalog.i18nc("@label", "Print as support")
toolItem: UM.RecolorImage
toolItem: UM.ColorImage
{
source: UM.Theme.getIcon("MeshTypeSupport")
color: UM.Theme.getColor("icon")
@ -109,7 +109,7 @@ Item
{
id: overlapMeshButton
text: catalog.i18nc("@label", "Modify settings for overlaps")
toolItem: UM.RecolorImage
toolItem: UM.ColorImage
{
source: UM.Theme.getIcon("MeshTypeIntersect")
color: UM.Theme.getColor("icon")
@ -124,7 +124,7 @@ Item
{
id: antiOverhangMeshButton
text: catalog.i18nc("@label", "Don't support overlaps")
toolItem: UM.RecolorImage
toolItem: UM.ColorImage
{
source: UM.Theme.getIcon("BlockSupportOverlaps")
color: UM.Theme.getColor("icon")
@ -304,12 +304,11 @@ Item
background: Item
{
UM.RecolorImage
UM.ColorImage
{
anchors.verticalCenter: parent.verticalCenter
width: parent.width
height: width
sourceSize.height: width
color: parent.hovered ? UM.Theme.getColor("setting_control_button_hover") : UM.Theme.getColor("setting_control_button")
source: UM.Theme.getIcon("Minus")
}

12
plugins/PostProcessingPlugin/PostProcessingPlugin.qml
View file

@ -143,14 +143,12 @@ UM.Dialog
}
}
UM.RecolorImage
UM.ColorImage
{
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
width: UM.Theme.getSize("standard_arrow").width
height: UM.Theme.getSize("standard_arrow").height
sourceSize.width: width
sourceSize.height: height
color: parent.enabled ? UM.Theme.getColor("text") : UM.Theme.getColor("text_disabled")
source: UM.Theme.getIcon("ChevronSingleDown")
}
@ -175,14 +173,12 @@ UM.Dialog
}
}
UM.RecolorImage
UM.ColorImage
{
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
width: UM.Theme.getSize("standard_arrow").width
height: UM.Theme.getSize("standard_arrow").height
sourceSize.width: width
sourceSize.height: height
color: upButton.enabled ? UM.Theme.getColor("text") : UM.Theme.getColor("text_disabled")
source: UM.Theme.getIcon("ChevronSingleUp")
}
@ -200,14 +196,12 @@ UM.Dialog
onClicked: manager.removeScriptByIndex(index)
}
UM.RecolorImage
UM.ColorImage
{
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
width: UM.Theme.getSize("standard_arrow").width
height: UM.Theme.getSize("standard_arrow").height
sourceSize.width: width
sourceSize.height: height
color: UM.Theme.getColor("text")
source: UM.Theme.getIcon("Cancel")
}

8
plugins/PrepareStage/PrepareMenu.qml
View file

@ -91,13 +91,11 @@ Item
height: parent.height
width: visible ? (headerPadding * 3 + UM.Theme.getSize("button_icon").height + iconSize) : 0
headerItem: UM.RecolorImage
headerItem: UM.ColorImage
{
id: menuIcon
source: UM.Theme.getIcon("Folder", "medium")
color: UM.Theme.getColor("icon")
sourceSize.height: height
}
contentItem: Item
@ -177,7 +175,7 @@ Item
contentItem: Item
{
UM.RecolorImage
UM.ColorImage
{
id: buttonIcon
source: UM.Theme.getIcon("Folder", "medium")
@ -185,8 +183,6 @@ Item
width: UM.Theme.getSize("button_icon").width
height: UM.Theme.getSize("button_icon").height
color: UM.Theme.getColor("icon")
sourceSize.height: height
}
}

2
plugins/UM3NetworkPrinting/resources/qml/CameraButton.qml
View file

@ -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

2
plugins/UM3NetworkPrinting/resources/qml/MonitorBuildplateConfiguration.qml
View file

@ -45,7 +45,7 @@ Item
radius: Math.floor(height / 2)
}
UM.RecolorImage
UM.ColorImage
{
id: buildplateIcon
anchors.centerIn: parent

8
plugins/UM3NetworkPrinting/resources/qml/MonitorCarousel.qml
View file

@ -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")
}

2
plugins/UM3NetworkPrinting/resources/qml/MonitorIconExtruder.qml
View file

@ -27,7 +27,7 @@ Item
height: size
width: size
UM.RecolorImage
UM.ColorImage
{
id: icon
anchors.fill: parent

14
plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobPreview.qml
View file

@ -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
}

2
plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml
View file

@ -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

2
plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml
View file

@ -40,7 +40,7 @@ Item
height: 18 * screenScaleFactor // TODO: Theme!
width: childrenRect.width
UM.RecolorImage
UM.ColorImage
{
id: externalLinkIcon
anchors.verticalCenter: manageQueueLabel.verticalCenter