3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Monitor view, "connect" button position

Browse source 
CURA-4509
This commit is contained in:
Aleksei S 2017-11-01 15:57:30 +01:00
parent 4326884f97
commit 87a7bf72a8
2 changed files with 62 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

15
resources/qml/MonitorButton.qml
View file

@ -185,24 +185,17 @@ Item
anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width;
}
Item {
Row {
id: buttonsRow
height: abortButton.height
width: {
// using childrenRect.width directly causes a binding loop, because setting the width affects the childrenRect
var children_width = additionalComponentsRow.width + pauseResumeButton.width + abortButton.width + 3 * UM.Theme.getSize("default_margin").width;
return Math.min(children_width, base.width - 2 * UM.Theme.getSize("sidebar_margin").width);
}
anchors.top: progressBar.bottom
anchors.topMargin: UM.Theme.getSize("sidebar_margin").height
anchors.right: parent.right
anchors.rightMargin: UM.Theme.getSize("sidebar_margin").width
clip: true
spacing: UM.Theme.getSize("default_margin").width
Row {
id: additionalComponentsRow
anchors.right: pauseResumeButton.left
anchors.rightMargin: UM.Theme.getSize("default_margin").width
spacing: UM.Theme.getSize("default_margin").width
}
@ -222,8 +215,6 @@ Item
{
id: pauseResumeButton
anchors.right: abortButton.left
anchors.rightMargin: UM.Theme.getSize("default_margin").width
height: UM.Theme.getSize("save_button_save_to_button").height
property bool userClicked: false
@ -270,8 +261,6 @@ Item
{
id: abortButton
anchors.right: parent.right
visible: printerConnected && Cura.MachineManager.printerOutputDevices[0].canAbort
enabled: printerConnected && Cura.MachineManager.printerOutputDevices[0].acceptsCommands &&
(["paused", "printing", "pre_print"].indexOf(Cura.MachineManager.printerOutputDevices[0].jobState) >= 0)