From 68de54c80319d0758147b674000a9cd08ef66b60 Mon Sep 17 00:00:00 2001 From: "j.delarago" Date: Fri, 22 Apr 2022 11:01:26 +0200 Subject: [PATCH 1/2] Path for placeholder image was one to many folders up. CURA-9146 --- plugins/Marketplace/resources/qml/CompatibilityDialog.qml | 4 ++-- plugins/Marketplace/resources/qml/MultipleLicenseDialog.qml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/Marketplace/resources/qml/CompatibilityDialog.qml b/plugins/Marketplace/resources/qml/CompatibilityDialog.qml index 837c4defa5..331502a7a7 100644 --- a/plugins/Marketplace/resources/qml/CompatibilityDialog.qml +++ b/plugins/Marketplace/resources/qml/CompatibilityDialog.qml @@ -67,7 +67,7 @@ UM.Dialog Image { id: packageIcon - source: model.icon_url || Qt.resolvedUrl("../../images/placeholder.svg") + source: model.icon_url || Qt.resolvedUrl("../images/placeholder.svg") height: lineHeight width: height sourceSize.height: height @@ -109,7 +109,7 @@ UM.Dialog Image { id: packageIcon - source: model.icon_url || Qt.resolvedUrl("../../images/placeholder.svg") + source: model.icon_url || Qt.resolvedUrl("../images/placeholder.svg") height: lineHeight width: height sourceSize.height: height diff --git a/plugins/Marketplace/resources/qml/MultipleLicenseDialog.qml b/plugins/Marketplace/resources/qml/MultipleLicenseDialog.qml index aa11d3a7e9..a3d4b60221 100644 --- a/plugins/Marketplace/resources/qml/MultipleLicenseDialog.qml +++ b/plugins/Marketplace/resources/qml/MultipleLicenseDialog.qml @@ -51,7 +51,7 @@ UM.Dialog sourceSize.width: width sourceSize.height: height fillMode: Image.PreserveAspectFit - source: licenseModel.iconUrl || Qt.resolvedUrl("../../images/placeholder.svg") + source: licenseModel.iconUrl || Qt.resolvedUrl("../images/placeholder.svg") mipmap: true } From 6ce641258059d77c306206612e733c59be5a65c2 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 25 Apr 2022 11:14:13 +0200 Subject: [PATCH 2/2] Update list of projects that can be updated without string freeze break Just this one, I'm afraid. Contributes to issue CURA-9121. --- resources/qml/Dialogs/AboutDialog.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/Dialogs/AboutDialog.qml b/resources/qml/Dialogs/AboutDialog.qml index e6d15af2d9..738c72f52d 100644 --- a/resources/qml/Dialogs/AboutDialog.qml +++ b/resources/qml/Dialogs/AboutDialog.qml @@ -137,7 +137,7 @@ UM.Dialog projectsModel.append({ name: "libArcus", description: catalog.i18nc("@label", "Interprocess communication library"), license: "LGPLv3", url: "https://github.com/Ultimaker/libArcus" }); projectsModel.append({ name: "Python", description: catalog.i18nc("@label", "Programming language"), license: "Python", url: "http://python.org/" }); - projectsModel.append({ name: "Qt5", description: catalog.i18nc("@label", "GUI framework"), license: "LGPLv3", url: "https://www.qt.io/" }); + projectsModel.append({ name: "Qt6", description: catalog.i18nc("@label", "GUI framework"), license: "LGPLv3", url: "https://www.qt.io/" }); projectsModel.append({ name: "PyQt", description: catalog.i18nc("@label", "GUI framework bindings"), license: "GPL", url: "https://riverbankcomputing.com/software/pyqt" }); projectsModel.append({ name: "SIP", description: catalog.i18nc("@label", "C/C++ Binding library"), license: "GPL", url: "https://riverbankcomputing.com/software/sip" }); projectsModel.append({ name: "Protobuf", description: catalog.i18nc("@label", "Data interchange format"), license: "BSD", url: "https://developers.google.com/protocol-buffers" });