GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-30 15:54:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup about page

Browse Source 
CURA-10561
This commit is contained in:
c.lamboo 2023-10-19 19:59:48 +02:00
parent cdc3f910d3
commit c7eee660de
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
resources/qml/Dialogs/AboutDialog.qml
View File

@ -10,6 +10,8 @@ import Cura 1.6 as Cura
UM.Dialog UM.Dialog
{ {
readonly property UM.I18nCatalog catalog: UM.I18nCatalog { name: "cura" }
id: base id: base
title: catalog.i18nc("@title:window The argument is the application name.", "About %1").arg(CuraApplication.applicationDisplayName) title: catalog.i18nc("@title:window The argument is the application name.", "About %1").arg(CuraApplication.applicationDisplayName)
@ -39,8 +41,6 @@ UM.Dialog
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
anchors.centerIn: parent anchors.centerIn: parent
UM.I18nCatalog{ id: catalog; name: "cura" }
} }
UM.Label UM.Label
@ -69,7 +69,7 @@ UM.Dialog
{ {
text: { text: {
if (typeof(url) !== "undefined" && url !== "") { if (typeof(url) !== "undefined" && url !== "") {
return "<a href=\"" + url + "\">" + name + "</a>"; return `<a href="${url}">${name}</a>`;
} else { } else {
return name; return name;
} }
@ -78,7 +78,6 @@ UM.Dialog
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredWidth: 2 Layout.preferredWidth: 2
onLinkActivated: Qt.openUrlExternally(url) onLinkActivated: Qt.openUrlExternally(url)
elide: Text.ElideRight
} }
UM.Label UM.Label
@ -87,7 +86,6 @@ UM.Dialog
visible: text !== "" visible: text !== ""
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredWidth: 3 Layout.preferredWidth: 3
elide: Text.ElideRight
} }
UM.Label UM.Label
@ -96,7 +94,6 @@ UM.Dialog
visible: text !== "" visible: text !== ""
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredWidth: 2 Layout.preferredWidth: 2
elide: Text.ElideRight
} }
UM.Label UM.Label
@ -105,7 +102,6 @@ UM.Dialog
visible: text !== "" visible: text !== ""
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredWidth: 2 Layout.preferredWidth: 2
elide: Text.ElideRight
} }
} }
@ -147,7 +143,8 @@ UM.Dialog
{ {
width: parent.width width: parent.width
delegate: Loader { delegate: Loader
{
sourceComponent: dependency_row sourceComponent: dependency_row
width: parent.width width: parent.width
property string name: model.name property string name: model.name
@ -226,8 +223,11 @@ UM.Dialog
Repeater Repeater
{ {
width: parent.width width: parent.width
model: Object.entries(CuraApplication.conanInstalls).map(function (item) { return { name: item[0], version: item[1].version } }) model: Object
delegate: Loader { .entries(CuraApplication.conanInstalls)
.map(([name, { version }]) => ({ name, version }))
delegate: Loader
{
sourceComponent: dependency_row sourceComponent: dependency_row
width: parent.width width: parent.width
property string name: modelData.name property string name: modelData.name
@ -249,14 +249,17 @@ UM.Dialog
visible: !showDefaultDependencies visible: !showDefaultDependencies
Repeater Repeater
{ {
delegate: Loader { delegate: Loader
{
sourceComponent: dependency_row sourceComponent: dependency_row
width: parent.width width: parent.width
property string name: modelData.name property string name: modelData.name
property string version: modelData.version property string version: modelData.version
} }
width: parent.width width: parent.width
model: Object.entries(CuraApplication.pythonInstalls).map(function (item) { return { name: item[0], version: item[1].version } }) model: Object
.entries(CuraApplication.pythonInstalls)
.map(([name, { version }]) => ({ name, version }))
} }
} }
} }
@ -264,7 +267,6 @@ UM.Dialog
rightButtons: Cura.TertiaryButton rightButtons: Cura.TertiaryButton
{ {
//: Close about dialog button
id: closeButton id: closeButton
text: catalog.i18nc("@action:button", "Close") text: catalog.i18nc("@action:button", "Close")
onClicked: reject() onClicked: reject()