mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-14 18:27:51 -06:00
Style improvements
Contributes to CL-897 and CL-1051
This commit is contained in:
parent
6f33c4410c
commit
1ad008f45c
4 changed files with 10 additions and 6 deletions
|
@ -36,7 +36,6 @@ Item {
|
||||||
anchors {
|
anchors {
|
||||||
left: parent.left;
|
left: parent.left;
|
||||||
right: parent.right;
|
right: parent.right;
|
||||||
top: parent.top;
|
|
||||||
}
|
}
|
||||||
color: {
|
color: {
|
||||||
if(configurationChangeToggle.containsMouse) {
|
if(configurationChangeToggle.containsMouse) {
|
||||||
|
|
|
@ -15,7 +15,6 @@ Item {
|
||||||
// Extruder circle
|
// Extruder circle
|
||||||
Item {
|
Item {
|
||||||
id: extruderCircle;
|
id: extruderCircle;
|
||||||
anchors.verticalCenter: parent.verticalCenter;
|
|
||||||
height: UM.Theme.getSize("monitor_tab_extruder_circle").height;
|
height: UM.Theme.getSize("monitor_tab_extruder_circle").height;
|
||||||
width: UM.Theme.getSize("monitor_tab_extruder_circle").width;
|
width: UM.Theme.getSize("monitor_tab_extruder_circle").width;
|
||||||
|
|
||||||
|
|
|
@ -39,8 +39,8 @@ Item {
|
||||||
Popup {
|
Popup {
|
||||||
id: popup;
|
id: popup;
|
||||||
background: Item {
|
background: Item {
|
||||||
height: childrenRect.height;
|
height: popup.height;
|
||||||
width: childrenRect.width;
|
width: popup.width;
|
||||||
|
|
||||||
DropShadow {
|
DropShadow {
|
||||||
anchors.fill: pointedRectangle;
|
anchors.fill: pointedRectangle;
|
||||||
|
|
|
@ -10,6 +10,7 @@ import QtQuick.Controls 1.4 as LegacyControls
|
||||||
import UM 1.3 as UM
|
import UM 1.3 as UM
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
|
id: root;
|
||||||
property var printer: null;
|
property var printer: null;
|
||||||
property var printJob: printer ? printer.activePrintJob : null;
|
property var printJob: printer ? printer.activePrintJob : null;
|
||||||
property var collapsed: true;
|
property var collapsed: true;
|
||||||
|
@ -38,10 +39,13 @@ Item {
|
||||||
printJob: root.printer ? root.printer.activePrintJob : null;
|
printJob: root.printer ? root.printer.activePrintJob : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
HorizontalLine {}
|
HorizontalLine {
|
||||||
|
visible: root.printJob;
|
||||||
|
}
|
||||||
|
|
||||||
Row {
|
Row {
|
||||||
height: childrenRect.height;
|
height: childrenRect.height;
|
||||||
|
visible: root.printJob;
|
||||||
width: parent.width;
|
width: parent.width;
|
||||||
|
|
||||||
PrintJobTitle {
|
PrintJobTitle {
|
||||||
|
@ -60,8 +64,9 @@ Item {
|
||||||
|
|
||||||
|
|
||||||
PrintJobPreview {
|
PrintJobPreview {
|
||||||
job: root.printer && root.printer.activePrintJob ? root.printer.activePrintJob : null;
|
|
||||||
anchors.horizontalCenter: parent.horizontalCenter;
|
anchors.horizontalCenter: parent.horizontalCenter;
|
||||||
|
job: root.printer && root.printer.activePrintJob ? root.printer.activePrintJob : null;
|
||||||
|
visible: root.printJob;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -74,5 +79,6 @@ Item {
|
||||||
leftMargin: Math.round(0.5 * UM.Theme.getSize("default_margin").width);
|
leftMargin: Math.round(0.5 * UM.Theme.getSize("default_margin").width);
|
||||||
}
|
}
|
||||||
iconSource: "../svg/camera-icon.svg";
|
iconSource: "../svg/camera-icon.svg";
|
||||||
|
visible: root.printJob;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue