Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Ultimaker/Cura.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaime van Kessel <nallath@gmail.com>2019-01-10 18:32:43 +0300
committerJaime van Kessel <nallath@gmail.com>2019-01-10 18:32:43 +0300
commitff79e91686c070c1df206c2dc7f93555f04758fd (patch)
tree66674b75c3b70b98ee9a5ed852325a265c3e4738 /resources/qml/ActionPanel/SliceProcessWidget.qml
parent614b1000fd8642d77ea38b1f6de21e0d24d1adbe (diff)
Move the additional components for the save button out of the action panel
CURA-6097
Diffstat (limited to 'resources/qml/ActionPanel/SliceProcessWidget.qml')
-rw-r--r--resources/qml/ActionPanel/SliceProcessWidget.qml38
1 files changed, 2 insertions, 36 deletions
diff --git a/resources/qml/ActionPanel/SliceProcessWidget.qml b/resources/qml/ActionPanel/SliceProcessWidget.qml
index 0f415a6a2d..08966ce82c 100644
--- a/resources/qml/ActionPanel/SliceProcessWidget.qml
+++ b/resources/qml/ActionPanel/SliceProcessWidget.qml
@@ -110,8 +110,7 @@ Column
height: parent.height
- anchors.right: additionalComponents.left
- anchors.rightMargin: additionalComponents.width != 0 ? UM.Theme.getSize("default_margin").width : 0
+ anchors.right: parent.right
anchors.left: parent.left
text: catalog.i18nc("@button", "Slice")
@@ -128,45 +127,12 @@ Column
height: parent.height
anchors.left: parent.left
- anchors.right: additionalComponents.left
- anchors.rightMargin: additionalComponents.width != 0 ? UM.Theme.getSize("default_margin").width : 0
+ anchors.right: parent.right
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
- }
- }
- }
}