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

Merge branch 'CL-1124_configuration_override_improvements' into 3.6

Browse Source
This commit is contained in:
Simon Edwards 2018-11-06 10:19:32 +01:00
commit 6304dde5a9
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml
View File

@ -296,6 +296,7 @@ Item {
verticalCenter: parent.verticalCenter; verticalCenter: parent.verticalCenter;
} }
color: UM.Theme.getColor("text"); color: UM.Theme.getColor("text");
font: UM.Theme.getFont("default");
text: catalog.i18nc("@label", "Configuration change"); text: catalog.i18nc("@label", "Configuration change");
} }
@ -355,7 +356,7 @@ Item {
anchors.fill: parent; anchors.fill: parent;
elide: Text.ElideRight; elide: Text.ElideRight;
color: UM.Theme.getColor("text"); color: UM.Theme.getColor("text");
font: UM.Theme.getFont("large_nonbold"); font: UM.Theme.getFont("default");
text: { text: {
if (!printJob || printJob.configurationChanges.length === 0) { if (!printJob || printJob.configurationChanges.length === 0) {
return ""; return "";
@ -398,6 +399,22 @@ Item {
bottom: parent.bottom; bottom: parent.bottom;
left: parent.left; left: parent.left;
} }
background: Rectangle {
border {
color: UM.Theme.getColor("monitor_lining_heavy");
width: UM.Theme.getSize("default_lining").width;
}
color: parent.hovered ? UM.Theme.getColor("monitor_card_background_inactive") : UM.Theme.getColor("monitor_card_background");
implicitHeight: UM.Theme.getSize("default_margin").height * 3;
implicitWidth: UM.Theme.getSize("default_margin").height * 8;
}
contentItem: Label {
color: UM.Theme.getColor("text");
font: UM.Theme.getFont("medium");
horizontalAlignment: Text.AlignHCenter;
text: parent.text;
verticalAlignment: Text.AlignVCenter;
}
onClicked: { onClicked: {
overrideConfirmationDialog.visible = true; overrideConfirmationDialog.visible = true;
} }