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

Don't show camera icon unless printer details are expanded

Browse source 
Contributes to CL-1063
This commit is contained in:
Ian Paschal 2018-10-31 13:52:31 +01:00
parent a5c2a73487
commit 1ba8eff7fa
2 changed files with 23 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

55
plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml
View file

@ -36,7 +36,7 @@ Item {
return UM.Theme.getColor("monitor_card_background");
}
}
height: childrenRect.height + UM.Theme.getSize("default_margin").height;
height: childrenRect.height;
layer.effect: DropShadow {
radius: root.shadowRadius;
verticalOffset: root.shadowOffset;
@ -47,29 +47,25 @@ Item {
Column {
id: cardContents;
anchors {
top: parent.top;
topMargin: UM.Theme.getSize("default_margin").height;
}
height: childrenRect.height;
width: parent.width;
spacing: UM.Theme.getSize("default_margin").height;
// Main card
Item {
id: mainCard;
height: 60 * screenScaleFactor;
anchors {
left: parent.left;
leftMargin: UM.Theme.getSize("default_margin").width;
right: parent.right;
rightMargin: UM.Theme.getSize("default_margin").width;
}
height: 60 * screenScaleFactor + 2 * UM.Theme.getSize("default_margin").height;
width: parent.width;
// Machine icon
Item {
id: machineIcon;
anchors {
leftMargin: UM.Theme.getSize("wide_margin").width;
top: parent.top;
left: parent.left;
margins: UM.Theme.getSize("default_margin").width;
}
anchors.verticalCenter: parent.verticalCenter;
height: parent.height - 2 * UM.Theme.getSize("default_margin").width;
width: height;
@ -228,17 +224,6 @@ Item {
}
}
}
HorizontalLine {
anchors {
left: parent.left;
leftMargin: UM.Theme.getSize("default_margin").width;
right: parent.right;
rightMargin: UM.Theme.getSize("default_margin").width;
}
visible: root.printer;
}
// Detailed card
PrinterCardDetails {
collapsed: root.collapsed;
@ -246,25 +231,11 @@ Item {
visible: root.printer;
}
CameraButton {
id: showCameraButton;
anchors {
left: parent.left;
leftMargin: UM.Theme.getSize("default_margin").width;
}
iconSource: "../svg/camera-icon.svg";
visible: root.printer && root.printJob;
// Progress bar
PrinterCardProgressBar {
visible: printer && printer.activePrintJob != null;
width: parent.width;
}
}
// Progress bar
PrinterCardProgressBar {
anchors {
top: cardContents.bottom;
topMargin: UM.Theme.getSize("default_margin").height;
}
visible: printer && printer.activePrintJob != null;
width: parent.width;
}
}
}