3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 15:44:04 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge branch '5.0'

Browse source
This commit is contained in:
Ghostkeeper 2022-04-25 11:14:24 +02:00
commit 3b24caed4f
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/Marketplace/resources/qml/CompatibilityDialog.qml
View file

@ -67,7 +67,7 @@ UM.Dialog
Image Image
{ {
id: packageIcon id: packageIcon
source: model.icon_url || Qt.resolvedUrl("../../images/placeholder.svg") source: model.icon_url || Qt.resolvedUrl("../images/placeholder.svg")
height: lineHeight height: lineHeight
width: height width: height
sourceSize.height: height sourceSize.height: height
@ -109,7 +109,7 @@ UM.Dialog
Image Image
{ {
id: packageIcon id: packageIcon
source: model.icon_url || Qt.resolvedUrl("../../images/placeholder.svg") source: model.icon_url || Qt.resolvedUrl("../images/placeholder.svg")
height: lineHeight height: lineHeight
width: height width: height
sourceSize.height: height sourceSize.height: height

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

@ -51,7 +51,7 @@ UM.Dialog
sourceSize.width: width sourceSize.width: width
sourceSize.height: height sourceSize.height: height
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
source: licenseModel.iconUrl || Qt.resolvedUrl("../../images/placeholder.svg") source: licenseModel.iconUrl || Qt.resolvedUrl("../images/placeholder.svg")
mipmap: true mipmap: true
} }

2
resources/qml/Dialogs/AboutDialog.qml
View file

@ -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: "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: "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: "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: "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" }); projectsModel.append({ name: "Protobuf", description: catalog.i18nc("@label", "Data interchange format"), license: "BSD", url: "https://developers.google.com/protocol-buffers" });