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

Merge pull request #4689 from Ultimaker/CL-1063_always_show_camera_monitor

Browse Source 
CL-1063 Always show camera icon in monitor tab
This commit is contained in:
Simon Edwards 2018-10-30 11:49:58 +01:00 committed by GitHub
commit d64465ca48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml
View File

@ -223,6 +223,16 @@ 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 // Detailed card
PrinterCardDetails { PrinterCardDetails {
collapsed: root.collapsed; collapsed: root.collapsed;
@ -230,6 +240,19 @@ Item {
visible: root.printer; visible: root.printer;
} }
Item {
id: cameraButtonWrapper;
height: showCameraButton.width + 2 * UM.Theme.getSize("default_margin").height;
visible: root.printer && root.printJob;
width: height;
CameraButton {
id: showCameraButton;
anchors.centerIn: parent;
iconSource: "../svg/camera-icon.svg";
}
}
// Progress bar // Progress bar
PrinterCardProgressBar { PrinterCardProgressBar {
visible: printer && printer.activePrintJob != null; visible: printer && printer.activePrintJob != null;

14
plugins/UM3NetworkPrinting/resources/qml/PrinterCardDetails.qml
View File

@ -32,8 +32,6 @@ Item {
spacing: UM.Theme.getSize("default_margin").height; spacing: UM.Theme.getSize("default_margin").height;
width: parent.width; width: parent.width;
HorizontalLine {}
PrinterInfoBlock { PrinterInfoBlock {
printer: root.printer; printer: root.printer;
printJob: root.printer ? root.printer.activePrintJob : null; printJob: root.printer ? root.printer.activePrintJob : null;
@ -69,16 +67,4 @@ Item {
visible: root.printJob; visible: root.printJob;
} }
} }
CameraButton {
id: showCameraButton;
anchors {
bottom: contentColumn.bottom;
bottomMargin: Math.round(1.5 * UM.Theme.getSize("default_margin").height);
left: contentColumn.left;
leftMargin: Math.round(0.5 * UM.Theme.getSize("default_margin").width);
}
iconSource: "../svg/camera-icon.svg";
visible: root.printJob;
}
} }