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

Merge remote-tracking branch 'origin/4.0' into CL-1165_missing_cloud_info

Browse source
This commit is contained in:
Ian Paschal 2019-01-23 12:05:06 +01:00
commit 32072e3bfe
38 changed files with 243 additions and 233 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -13,7 +13,7 @@ Rectangle {
property var enabled: true
property var iconSource: null;
color: !enabled ? "#cccccc" : "#0a0850" // TODO: Theme!
color: UM.Theme.getColor("monitor_icon_primary")
height: width;
radius: Math.round(0.5 * width);
width: 24 * screenScaleFactor;
@ -24,7 +24,7 @@ Rectangle {
horizontalCenter: parent.horizontalCenter;
verticalCenter: parent.verticalCenter;
}
color: UM.Theme.getColor("primary_text");
color: UM.Theme.getColor("monitor_icon_accent");
height: width;
source: iconSource;
width: Math.round(parent.width / 2);