mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-08-06 05:23:58 -06:00
Combine dublicated elements from PackageCard and PackagePage into
reusable component `PackageCardHeader` cura 8734
This commit is contained in:
casper
parent
4c516e8cec
commit
d405652db7
3 changed files with 362 additions and 598 deletions
|
|
@ -11,8 +11,7 @@ import Cura 1.6 as Cura
|
|||
Rectangle
|
||||
{
|
||||
id: root
|
||||
property var packageData
|
||||
property bool manageableInListView
|
||||
property alias packageData: packageCardHeader.packageData
|
||||
|
||||
height: childrenRect.height
|
||||
color: UM.Theme.getColor("main_background")
|
||||
|
|
@ -29,118 +28,12 @@ Rectangle
|
|||
width: parent.width
|
||||
height: UM.Theme.getSize("card").height
|
||||
|
||||
Image
|
||||
PackageCardHeader
|
||||
{
|
||||
id: packageItem
|
||||
anchors
|
||||
{
|
||||
top: parent.top
|
||||
left: parent.left
|
||||
margins: UM.Theme.getSize("default_margin").width
|
||||
}
|
||||
width: UM.Theme.getSize("card_icon").width
|
||||
height: width
|
||||
id: packageCardHeader
|
||||
showManageButtons: true
|
||||
|
||||
source: packageData.iconUrl != "" ? packageData.iconUrl : "../images/placeholder.svg"
|
||||
}
|
||||
|
||||
ColumnLayout
|
||||
{
|
||||
anchors
|
||||
{
|
||||
left: packageItem.right
|
||||
leftMargin: UM.Theme.getSize("default_margin").width
|
||||
right: parent.right
|
||||
rightMargin: UM.Theme.getSize("default_margin").width
|
||||
top: parent.top
|
||||
topMargin: UM.Theme.getSize("narrow_margin").height
|
||||
}
|
||||
height: packageItem.height + packageItem.anchors.margins * 2
|
||||
|
||||
// Title row.
|
||||
RowLayout
|
||||
{
|
||||
id: titleBar
|
||||
Layout.preferredWidth: parent.width
|
||||
Layout.preferredHeight: childrenRect.height
|
||||
|
||||
Label
|
||||
{
|
||||
text: packageData.displayName
|
||||
font: UM.Theme.getFont("medium_bold")
|
||||
color: UM.Theme.getColor("text")
|
||||
verticalAlignment: Text.AlignTop
|
||||
}
|
||||
VerifiedIcon
|
||||
{
|
||||
enabled: packageData.isCheckedByUltimaker
|
||||
visible: packageData.isCheckedByUltimaker
|
||||
}
|
||||
|
||||
|
||||
Control
|
||||
{
|
||||
Layout.preferredWidth: UM.Theme.getSize("card_tiny_icon").width
|
||||
Layout.preferredHeight: UM.Theme.getSize("card_tiny_icon").height
|
||||
Layout.alignment: Qt.AlignCenter
|
||||
enabled: false // remove!
|
||||
visible: false // replace packageInfo.XXXXXX
|
||||
// TODO: waiting for materials card implementation
|
||||
|
||||
Cura.ToolTip
|
||||
{
|
||||
tooltipText: "" // TODO
|
||||
visible: parent.hovered
|
||||
}
|
||||
|
||||
UM.RecolorImage
|
||||
{
|
||||
anchors.fill: parent
|
||||
|
||||
color: UM.Theme.getColor("primary")
|
||||
source: UM.Theme.getIcon("CheckCircle") // TODO
|
||||
}
|
||||
|
||||
// onClicked: Qt.openUrlExternally( XXXXXX ) // TODO
|
||||
}
|
||||
|
||||
Label
|
||||
{
|
||||
id: packageVersionLabel
|
||||
text: packageData.packageVersion
|
||||
font: UM.Theme.getFont("default")
|
||||
color: UM.Theme.getColor("text")
|
||||
Layout.fillWidth: true
|
||||
}
|
||||
|
||||
Button
|
||||
{
|
||||
id: externalLinkButton
|
||||
|
||||
// For some reason if i set padding, they don't match up. If i set all of them explicitly, it does work?
|
||||
leftPadding: UM.Theme.getSize("narrow_margin").width
|
||||
rightPadding: UM.Theme.getSize("narrow_margin").width
|
||||
topPadding: UM.Theme.getSize("narrow_margin").width
|
||||
bottomPadding: UM.Theme.getSize("narrow_margin").width
|
||||
|
||||
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
|
||||
{
|
||||
source: UM.Theme.getIcon("LinkExternal")
|
||||
color: UM.Theme.getColor("icon")
|
||||
implicitWidth: UM.Theme.getSize("card_tiny_icon").width
|
||||
implicitHeight: UM.Theme.getSize("card_tiny_icon").height
|
||||
}
|
||||
|
||||
background: Rectangle
|
||||
{
|
||||
color: externalLinkButton.hovered ? UM.Theme.getColor("action_button_hovered"): "transparent"
|
||||
radius: externalLinkButton.width / 2
|
||||
}
|
||||
onClicked: Qt.openUrlExternally(packageData.authorInfoUrl)
|
||||
}
|
||||
}
|
||||
anchors.fill: parent
|
||||
|
||||
Row
|
||||
{
|
||||
|
|
@ -167,160 +60,6 @@ Rectangle
|
|||
text: packageData.downloadCount
|
||||
}
|
||||
}
|
||||
|
||||
// Author and action buttons.
|
||||
RowLayout
|
||||
{
|
||||
id: authorAndActionButton
|
||||
Layout.preferredWidth: parent.width
|
||||
Layout.preferredHeight: childrenRect.height
|
||||
|
||||
spacing: UM.Theme.getSize("narrow_margin").width
|
||||
|
||||
Label
|
||||
{
|
||||
id: authorBy
|
||||
Layout.alignment: Qt.AlignCenter
|
||||
|
||||
text: catalog.i18nc("@label", "By")
|
||||
font: UM.Theme.getFont("default")
|
||||
color: UM.Theme.getColor("text")
|
||||
}
|
||||
|
||||
Cura.TertiaryButton
|
||||
{
|
||||
Layout.fillWidth: true
|
||||
Layout.preferredHeight: authorBy.height
|
||||
Layout.alignment: Qt.AlignCenter
|
||||
|
||||
text: packageData.authorName
|
||||
textFont: UM.Theme.getFont("default_bold")
|
||||
textColor: UM.Theme.getColor("text") // override normal link color
|
||||
leftPadding: 0
|
||||
rightPadding: 0
|
||||
iconSource: UM.Theme.getIcon("LinkExternal")
|
||||
isIconOnRightSide: true
|
||||
|
||||
onClicked: Qt.openUrlExternally(packageData.authorInfoUrl)
|
||||
}
|
||||
|
||||
ManageButton
|
||||
{
|
||||
id: enableManageButton
|
||||
visible: !(installManageButton.confirmed || updateManageButton.confirmed) || enableManageButton.confirmed
|
||||
button_style: packageData.stateManageEnableButton
|
||||
Layout.alignment: Qt.AlignTop
|
||||
busy: packageData.enableManageButton == "busy"
|
||||
confirmed: packageData.enableManageButton == "confirmed"
|
||||
text: {
|
||||
switch (packageData.stateManageEnableButton) {
|
||||
case "primary":
|
||||
return catalog.i18nc("@button", "Enable");
|
||||
case "secondary":
|
||||
return catalog.i18nc("@button", "Disable");
|
||||
case "busy":
|
||||
if (packageData.installationStatus) {
|
||||
return catalog.i18nc("@button", "Enabling...");
|
||||
} else {
|
||||
return catalog.i18nc("@button", "Disabling...");
|
||||
}
|
||||
case "confirmed":
|
||||
if (packageData.installationStatus) {
|
||||
return catalog.i18nc("@button", "Enabled");
|
||||
} else {
|
||||
return catalog.i18nc("@button", "Disabled");
|
||||
}
|
||||
default:
|
||||
return "";
|
||||
}
|
||||
}
|
||||
enabled: !installManageButton.busy && !updateManageButton.busy
|
||||
|
||||
onClicked:
|
||||
{
|
||||
if (primary_action)
|
||||
{
|
||||
packageData.enablePackageTriggered(packageData.packageId)
|
||||
}
|
||||
else
|
||||
{
|
||||
packageData.disablePackageTriggered(packageData.packageId)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ManageButton
|
||||
{
|
||||
id: installManageButton
|
||||
visible: !(enableManageButton.confirmed || updateManageButton.confirmed)
|
||||
button_style: packageData.stateManageInstallButton
|
||||
busy: packageData.stateManageInstallButton == "busy"
|
||||
confirmed: packageData.stateManageInstallButton == "confirmed"
|
||||
Layout.alignment: Qt.AlignTop
|
||||
text: {
|
||||
switch (packageData.stateManageInstallButton) {
|
||||
case "primary":
|
||||
return catalog.i18nc("@button", "Install");
|
||||
case "secondary":
|
||||
return catalog.i18nc("@button", "Uninstall");
|
||||
case "busy":
|
||||
if (packageData.installationStatus) {
|
||||
return catalog.i18nc("@button", "Installing...");
|
||||
} else {
|
||||
return catalog.i18nc("@button", "Uninstalling...");
|
||||
}
|
||||
case "confirmed":
|
||||
if (packageData.installationStatus) {
|
||||
return catalog.i18nc("@button", "Installed");
|
||||
} else {
|
||||
return catalog.i18nc("@button", "Uninstalled");
|
||||
}
|
||||
default:
|
||||
return "";
|
||||
}
|
||||
}
|
||||
enabled: !enableManageButton.busy && !updateManageButton.busy
|
||||
|
||||
onClicked:
|
||||
{
|
||||
if (primary_action)
|
||||
{
|
||||
packageData.installPackageTriggered(packageData.packageId)
|
||||
}
|
||||
else
|
||||
{
|
||||
packageData.uninstallPackageTriggered(packageData.packageId)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ManageButton
|
||||
{
|
||||
id: updateManageButton
|
||||
visible: !installManageButton.confirmed || updateManageButton.confirmed
|
||||
|
||||
button_style: packageData.stateManageUpdateButton
|
||||
busy: packageData.stateManageUpdateButton == "busy"
|
||||
confirmed: packageData.stateManageUpdateButton == "confirmed"
|
||||
Layout.alignment: Qt.AlignTop
|
||||
enabled: !installManageButton.busy && !enableManageButton.busy
|
||||
|
||||
text: {
|
||||
switch (packageData.stateManageInstallButton) {
|
||||
case "primary":
|
||||
return catalog.i18nc("@button", "Update");
|
||||
case "busy":
|
||||
return catalog.i18nc("@button", "Updating...");
|
||||
case "confirmed":
|
||||
return catalog.i18nc("@button", "Updated");
|
||||
default:
|
||||
return "";
|
||||
}
|
||||
}
|
||||
|
||||
onClicked: packageData.updatePackageTriggered(packageData.packageId)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue