3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-20 13:17:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Remove binding loops

Browse source 
Contributes to CL-1051
This commit is contained in:
Ian Paschal 2018-10-22 15:31:38 +02:00
parent 817899686a
commit 34abc48a1a
4 changed files with 21 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

8
plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml
View file

@ -39,12 +39,11 @@ Item {
Popup {
id: popup;
background: Item {
height: popup.height;
width: popup.width;
anchors.fill: parent;
DropShadow {
anchors.fill: pointedRectangle;
color: "#3F000000"; // 25% shadow
color: UM.Theme.getColor("monitor_shadow");
radius: UM.Theme.getSize("monitor_shadow_radius").width;
source: pointedRectangle;
transparentBorder: true;
@ -96,7 +95,8 @@ Item {
top: parent.top;
topMargin: UM.Theme.getSize("default_margin").height + 10 * screenScaleFactor; // Account for the point of the box
}
height: childrenRect.height + spacing * popupOptions.children.length + UM.Theme.getSize("default_margin").height;
// height: childrenRect.height + spacing * popupOptions.children.length + UM.Theme.getSize("default_margin").height;
height: 200;
spacing: Math.floor(UM.Theme.getSize("default_margin").height / 2);
width: parent.width;

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

@ -10,8 +10,8 @@ import UM 1.3 as UM
Item {
id: root;
property var shadowRadius: 5;
property var shadowOffset: 2;
property var shadowRadius: UM.Theme.getSize("monitor_shadow_radius").width;
property var shadowOffset: UM.Theme.getSize("monitor_shadow_offset").width;
property var printer: null;
property var collapsed: true;
height: childrenRect.height + shadowRadius * 2; // Bubbles upward
@ -52,21 +52,18 @@ Item {
// Main card
Item {
id: mainCard;
// I don't know why the extra height is needed but it is in order to look proportional.
height: childrenRect.height + 2;
height: 60 * screenScaleFactor + 2 * UM.Theme.getSize("default_margin").width;
width: parent.width;
// Machine icon
Item {
id: machineIcon;
anchors {
left: parent.left;
leftMargin: UM.Theme.getSize("wide_margin").width;
margins: UM.Theme.getSize("default_margin").width;
top: parent.top;
}
height: 58 * screenScaleFactor;
width: 58 * screenScaleFactor;
height: parent.height;
width: height;
// Skeleton
Rectangle {
@ -87,6 +84,9 @@ Item {
}
height: sourceSize.height;
source: {
if (!printer) {
return "";
}
switch(printer.type) {
case "Ultimaker 3":
return "../svg/UM3-icon.svg";
@ -104,20 +104,18 @@ Item {
// Printer info
Item {
id: printerInfo;
height: childrenRect.height
anchors {
left: machineIcon.right;
leftMargin: UM.Theme.getSize("default_margin").width;
right: collapseIcon.left;
rightMargin: UM.Theme.getSize("default_margin").width;
verticalCenter: machineIcon.verticalCenter;
}
height: childrenRect.height;
// Machine name
Item {
id: machineNameLabel;
height: UM.Theme.getSize("monitor_text_line").height;
width: parent.width * 0.3;
width: Math.round(parent.width * 0.3);
// Skeleton
Rectangle {
@ -132,7 +130,7 @@ Item {
color: UM.Theme.getColor("text");
elide: Text.ElideRight;
font: UM.Theme.getFont("default_bold");
text: printer.name;
text: printer ? printer.name : "";
visible: printer;
width: parent.width;
}
@ -146,7 +144,7 @@ Item {
topMargin: Math.round(UM.Theme.getSize("default_margin").height / 2);
}
height: UM.Theme.getSize("monitor_text_line").height;
width: parent.width * 0.75;
width: Math.round(parent.width * 0.75);
// Skeleton
Rectangle {
@ -214,9 +212,6 @@ Item {
Connections {
target: printerList;
onCurrentIndexChanged: {
if (!model) {
return;
}
root.collapsed = printerList.currentIndex != model.index;
}
}

4
plugins/UM3NetworkPrinting/resources/qml/PrinterCardDetails.qml
View file

@ -57,8 +57,8 @@ Item {
right: parent.right;
rightMargin: UM.Theme.getSize("wide_margin").width;
}
printJob: root.printer.activePrintJob;
visible: root.printer.activePrintJob;
printJob: root.printer ? root.printer.activePrintJob : null;
visible: printJob;
}
}

4
resources/themes/cura-light/theme.json
View file

@ -340,6 +340,7 @@
"monitor_progress_fill_inactive": [154, 154, 154, 255],
"monitor_progress_fill_text": [255,255,255,255],
"monitor_progress_fill": [12, 169, 227, 255],
"monitor_shadow": [0, 0, 0, 63],
"monitor_skeleton_fill": [245, 245, 245, 255],
"monitor_text_inactive": [154, 154, 154, 255]
},
@ -496,6 +497,7 @@
"monitor_text_line": [1.16, 1.16],
"monitor_thick_lining": [0.16, 0.16],
"monitor_corner_radius": [0.3, 0.3],
"monitor_shadow_radius": [0.4, 0.4]
"monitor_shadow_radius": [0.4, 0.4],
"monitor_shadow_offset": [0.15, 0.15]
}
}