diff options
author | Lipu Fei <lipu.fei815@gmail.com> | 2019-01-03 12:46:49 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-03 12:46:49 +0300 |
commit | d97b812ccd10de398977cfd2c17b4a7226d71232 (patch) | |
tree | d58a0fe4958c2b27d296bf78e37fccf97988d363 /resources/qml/ActionPanel/SliceProcessWidget.qml | |
parent | a5385b229acf0afc5f1b1fca9cd7dee368c3054d (diff) | |
parent | 979fd507dee720501422e17045b71c5abc46f467 (diff) |
Merge branch '4.0' into unify_font_types
Diffstat (limited to 'resources/qml/ActionPanel/SliceProcessWidget.qml')
-rw-r--r-- | resources/qml/ActionPanel/SliceProcessWidget.qml | 46 |
1 files changed, 44 insertions, 2 deletions
diff --git a/resources/qml/ActionPanel/SliceProcessWidget.qml b/resources/qml/ActionPanel/SliceProcessWidget.qml index 51c5e4cac7..1695be8748 100644 --- a/resources/qml/ActionPanel/SliceProcessWidget.qml +++ b/resources/qml/ActionPanel/SliceProcessWidget.qml @@ -107,7 +107,13 @@ Column { id: sliceButton fixedWidthMode: true - anchors.fill: parent + + height: parent.height + + anchors.right: additionalComponents.left + anchors.rightMargin: additionalComponents.width != 0 ? UM.Theme.getSize("default_margin").width : 0 + anchors.left: parent.left + text: catalog.i18nc("@button", "Slice") tooltip: catalog.i18nc("@label", "Start the slicing process") enabled: widget.backendState != UM.Backend.Error @@ -119,12 +125,48 @@ Column { id: cancelButton fixedWidthMode: true - anchors.fill: parent + height: parent.height + anchors.left: parent.left + + anchors.right: additionalComponents.left + anchors.rightMargin: additionalComponents.width != 0 ? UM.Theme.getSize("default_margin").width : 0 text: catalog.i18nc("@button", "Cancel") enabled: sliceButton.enabled visible: !sliceButton.visible onClicked: sliceOrStopSlicing() } + + Item + { + id: additionalComponents + width: childrenRect.width + anchors.right: parent.right + height: parent.height + Row + { + id: additionalComponentsRow + anchors.verticalCenter: parent.verticalCenter + spacing: UM.Theme.getSize("default_margin").width + } + } + Component.onCompleted: prepareButtons.addAdditionalComponents("saveButton") + + Connections + { + target: CuraApplication + onAdditionalComponentsChanged: prepareButtons.addAdditionalComponents("saveButton") + } + + function addAdditionalComponents (areaId) + { + if(areaId == "saveButton") + { + for (var component in CuraApplication.additionalComponents["saveButton"]) + { + CuraApplication.additionalComponents["saveButton"][component].parent = additionalComponentsRow + } + } + } } |