GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-11 12:59:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add shadows to various used actionbuttons

Browse Source 
CURA-5959
This commit is contained in:
Jaime van Kessel 2018-11-23 11:20:53 +01:00
parent a71e75508c
commit 3ba4b9fd81
4 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
resources/qml/ActionPanel/OutputDevicesActionButton.qml
View File

@ -17,7 +17,8 @@ Item
id: saveToButton id: saveToButton
height: parent.height height: parent.height
fixedWidthMode: true fixedWidthMode: true
shadowEnabled: true
shadowColor: UM.Theme.getColor("primary_shadow")
anchors anchors
{ {
top: parent.top top: parent.top
@ -42,6 +43,9 @@ Item
id: deviceSelectionMenu id: deviceSelectionMenu
height: parent.height height: parent.height
shadowEnabled: true
shadowColor: UM.Theme.getColor("primary_shadow")
anchors anchors
{ {
top: parent.top top: parent.top

3
resources/qml/ActionPanel/OutputProcessWidget.qml
View File

@ -115,6 +115,9 @@ Column
textHoverColor: UM.Theme.getColor("text") textHoverColor: UM.Theme.getColor("text")
onClicked: UM.Controller.setActiveStage("PreviewStage") onClicked: UM.Controller.setActiveStage("PreviewStage")
visible: UM.Controller.activeStage != null && UM.Controller.activeStage.stageId != "PreviewStage" visible: UM.Controller.activeStage != null && UM.Controller.activeStage.stageId != "PreviewStage"
shadowEnabled: true
shadowColor: UM.Theme.getColor("action_button_disabled_shadow")
} }
Cura.OutputDevicesActionButton Cura.OutputDevicesActionButton

17
resources/qml/ActionPanel/SliceProcessWidget.qml
View File

@ -93,21 +93,20 @@ Column
// Disable the slice process when // Disable the slice process when
property bool disabledSlice: [UM.Backend.Done, UM.Backend.Error].indexOf(widget.backendState) != -1 property bool disabledSlice: [UM.Backend.Done, UM.Backend.Error].indexOf(widget.backendState) != -1
text: property bool isSlicing: [UM.Backend.NotStarted, UM.Backend.Error].indexOf(widget.backendState) == -1
{
if ([UM.Backend.NotStarted, UM.Backend.Error].indexOf(widget.backendState) != -1) text: isSlicing ? catalog.i18nc("@button", "Cancel") : catalog.i18nc("@button", "Slice")
{
return catalog.i18nc("@button", "Slice")
}
return catalog.i18nc("@button", "Cancel")
}
enabled: !autoSlice && !disabledSlice enabled: !autoSlice && !disabledSlice
visible: !autoSlice 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") disabledColor: UM.Theme.getColor("action_button_disabled")
textDisabledColor: UM.Theme.getColor("action_button_disabled_text") textDisabledColor: UM.Theme.getColor("action_button_disabled_text")
shadowEnabled: true 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() onClicked: sliceOrStopSlicing()
} }

2
resources/themes/cura-light/theme.json
View File

@ -83,10 +83,12 @@
"primary": [50, 130, 255, 255], "primary": [50, 130, 255, 255],
"primary_shadow": [64, 47, 205, 255],
"primary_hover": [48, 182, 231, 255], "primary_hover": [48, 182, 231, 255],
"primary_text": [255, 255, 255, 255], "primary_text": [255, 255, 255, 255],
"border": [127, 127, 127, 255], "border": [127, 127, 127, 255],
"secondary": [245, 245, 245, 255], "secondary": [245, 245, 245, 255],
"secondary_shadow": [228, 228, 228, 255],
"main_window_header_background": [10, 8, 80, 255], "main_window_header_background": [10, 8, 80, 255],
"main_window_header_button_text_active": [10, 8, 80, 255], "main_window_header_button_text_active": [10, 8, 80, 255],