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

Fix printer card skeleton colors

Browse source 
Contributes to CL-1051
This commit is contained in:
Ian Paschal 2018-10-24 11:13:38 +02:00
parent 8662e1a125
commit d077dcc851
3 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -60,16 +60,18 @@ Item {
id: machineIcon; id: machineIcon;
anchors { anchors {
leftMargin: UM.Theme.getSize("wide_margin").width; leftMargin: UM.Theme.getSize("wide_margin").width;
top: parent.top;
left: parent.left;
margins: UM.Theme.getSize("default_margin").width; margins: UM.Theme.getSize("default_margin").width;
} }
height: parent.height; height: parent.height - 2 * UM.Theme.getSize("default_margin").width;
width: height; width: height;
// Skeleton // Skeleton
Rectangle { Rectangle {
anchors.fill: parent; anchors.fill: parent;
color: UM.Theme.getColor("monitor_skeleton_fill"); // TODO: Theme! color: UM.Theme.getColor("monitor_skeleton_fill_dark");
radius: UM.Theme.getSize("default_margin").width; // TODO: Theme! radius: UM.Theme.getSize("default_margin").width;
visible: !printer; visible: !printer;
} }
@ -106,6 +108,7 @@ Item {
id: printerInfo; id: printerInfo;
anchors { anchors {
left: machineIcon.right; left: machineIcon.right;
leftMargin: UM.Theme.getSize("default_margin").width;
right: collapseIcon.left; right: collapseIcon.left;
verticalCenter: machineIcon.verticalCenter; verticalCenter: machineIcon.verticalCenter;
} }
@ -120,7 +123,7 @@ Item {
// Skeleton // Skeleton
Rectangle { Rectangle {
anchors.fill: parent; anchors.fill: parent;
color: UM.Theme.getColor("monitor_skeleton_fill"); // TODO: Theme! color: UM.Theme.getColor("monitor_skeleton_fill_dark");
visible: !printer; visible: !printer;
} }
@ -149,7 +152,7 @@ Item {
// Skeleton // Skeleton
Rectangle { Rectangle {
anchors.fill: parent; anchors.fill: parent;
color: UM.Theme.getColor("monitor_skeleton_fill"); // TODO: Theme! color: UM.Theme.getColor("monitor_skeleton_fill_dark");
visible: !printer; visible: !printer;
} }

3
resources/themes/cura-dark/theme.json
View file

@ -240,6 +240,7 @@
"monitor_progress_fill_text": [0, 0, 0, 255], "monitor_progress_fill_text": [0, 0, 0, 255],
"monitor_progress_fill": [216, 216, 216, 255], "monitor_progress_fill": [216, 216, 216, 255],
"monotir_printer_icon_inactive": [154, 154, 154, 255], "monotir_printer_icon_inactive": [154, 154, 154, 255],
"monitor_skeleton_fill": [31, 36, 39, 255] "monitor_skeleton_fill": [31, 36, 39, 255],
"monitor_skeleton_fill_dark": [31, 36, 39, 255]
} }
} }

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

@ -342,6 +342,7 @@
"monitor_progress_fill": [12, 169, 227, 255], "monitor_progress_fill": [12, 169, 227, 255],
"monitor_shadow": [0, 0, 0, 63], "monitor_shadow": [0, 0, 0, 63],
"monitor_skeleton_fill": [245, 245, 245, 255], "monitor_skeleton_fill": [245, 245, 245, 255],
"monitor_skeleton_fill_dark": [216, 216, 216, 255],
"monitor_text_inactive": [154, 154, 154, 255] "monitor_text_inactive": [154, 154, 154, 255]
}, },