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>2018-11-23 13:20:53 +0300
committerJaime van Kessel <nallath@gmail.com>2018-11-23 13:20:53 +0300
commit3ba4b9fd81ac3b38aa393d71697f9e1514ecb6d7 (patch)
tree18b6c509fd74047ed806698a5abd1629c6d715ba /resources/qml
parenta71e75508c5dacd5909d9b33307452f75244e78e (diff)
Add shadows to various used actionbuttons
CURA-5959
Diffstat (limited to 'resources/qml')
-rw-r--r--resources/qml/ActionPanel/OutputDevicesActionButton.qml6
-rw-r--r--resources/qml/ActionPanel/OutputProcessWidget.qml3
-rw-r--r--resources/qml/ActionPanel/SliceProcessWidget.qml17
3 files changed, 16 insertions, 10 deletions
diff --git a/resources/qml/ActionPanel/OutputDevicesActionButton.qml b/resources/qml/ActionPanel/OutputDevicesActionButton.qml
index be79a1893e..9682dddf14 100644
--- a/resources/qml/ActionPanel/OutputDevicesActionButton.qml
+++ b/resources/qml/ActionPanel/OutputDevicesActionButton.qml
@@ -17,7 +17,8 @@ Item
id: saveToButton
height: parent.height
fixedWidthMode: true
-
+ shadowEnabled: true
+ shadowColor: UM.Theme.getColor("primary_shadow")
anchors
{
top: parent.top
@@ -42,6 +43,9 @@ Item
id: deviceSelectionMenu
height: parent.height
+ shadowEnabled: true
+ shadowColor: UM.Theme.getColor("primary_shadow")
+
anchors
{
top: parent.top
diff --git a/resources/qml/ActionPanel/OutputProcessWidget.qml b/resources/qml/ActionPanel/OutputProcessWidget.qml
index 3c4386f079..79b9898e49 100644
--- a/resources/qml/ActionPanel/OutputProcessWidget.qml
+++ b/resources/qml/ActionPanel/OutputProcessWidget.qml
@@ -115,6 +115,9 @@ Column
textHoverColor: UM.Theme.getColor("text")
onClicked: UM.Controller.setActiveStage("PreviewStage")
visible: UM.Controller.activeStage != null && UM.Controller.activeStage.stageId != "PreviewStage"
+
+ shadowEnabled: true
+ shadowColor: UM.Theme.getColor("action_button_disabled_shadow")
}
Cura.OutputDevicesActionButton
diff --git a/resources/qml/ActionPanel/SliceProcessWidget.qml b/resources/qml/ActionPanel/SliceProcessWidget.qml
index 4f10e6879b..7cce323905 100644
--- a/resources/qml/ActionPanel/SliceProcessWidget.qml
+++ b/resources/qml/ActionPanel/SliceProcessWidget.qml
@@ -93,21 +93,20 @@ Column
// Disable the slice process when
property bool disabledSlice: [UM.Backend.Done, UM.Backend.Error].indexOf(widget.backendState) != -1
- text:
- {
- if ([UM.Backend.NotStarted, UM.Backend.Error].indexOf(widget.backendState) != -1)
- {
- return catalog.i18nc("@button", "Slice")
- }
- return catalog.i18nc("@button", "Cancel")
- }
+ property bool isSlicing: [UM.Backend.NotStarted, UM.Backend.Error].indexOf(widget.backendState) == -1
+
+ text: isSlicing ? catalog.i18nc("@button", "Cancel") : catalog.i18nc("@button", "Slice")
+
enabled: !autoSlice && !disabledSlice
visible: !autoSlice
+ color: isSlicing ? UM.Theme.getColor("secondary"): UM.Theme.getColor("primary")
+ textColor: isSlicing ? UM.Theme.getColor("primary"): UM.Theme.getColor("button_text")
+
disabledColor: UM.Theme.getColor("action_button_disabled")
textDisabledColor: UM.Theme.getColor("action_button_disabled_text")
shadowEnabled: true
- shadowColor: enabled ? UM.Theme.getColor("action_button_shadow"): UM.Theme.getColor("action_button_disabled_shadow")
+ shadowColor: isSlicing ? UM.Theme.getColor("secondary_shadow") : enabled ? UM.Theme.getColor("action_button_shadow"): UM.Theme.getColor("action_button_disabled_shadow")
onClicked: sliceOrStopSlicing()
}