3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 15:44:04 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Changed all the action buttons to either use primary or secondary button

Browse source 
CURA-5959
This commit is contained in:
Jaime van Kessel 2018-11-23 18:07:50 +01:00
parent af1ee53578
commit b82ea58bc8
8 changed files with 81 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

8
resources/qml/Account/GeneralOperations.qml
View file

@ -11,20 +11,16 @@ Row
{ {
spacing: UM.Theme.getSize("default_margin").width spacing: UM.Theme.getSize("default_margin").width
Cura.ActionButton Cura.SecondaryButton
{ {
width: UM.Theme.getSize("account_button").width width: UM.Theme.getSize("account_button").width
height: UM.Theme.getSize("account_button").height height: UM.Theme.getSize("account_button").height
text: catalog.i18nc("@button", "Create account") text: catalog.i18nc("@button", "Create account")
color: UM.Theme.getColor("secondary")
hoverColor: UM.Theme.getColor("secondary")
textColor: UM.Theme.getColor("main_window_header_button_text_active")
textHoverColor: UM.Theme.getColor("main_window_header_button_text_active")
onClicked: Qt.openUrlExternally("https://account.ultimaker.com/app/create") onClicked: Qt.openUrlExternally("https://account.ultimaker.com/app/create")
fixedWidthMode: true fixedWidthMode: true
} }
Cura.ActionButton Cura.PrimaryButton
{ {
width: UM.Theme.getSize("account_button").width width: UM.Theme.getSize("account_button").width
height: UM.Theme.getSize("account_button").height height: UM.Theme.getSize("account_button").height

8
resources/qml/Account/UserOperations.qml
View file

@ -11,20 +11,16 @@ Row
{ {
spacing: UM.Theme.getSize("default_margin").width spacing: UM.Theme.getSize("default_margin").width
Cura.ActionButton Cura.SecondaryButton
{ {
width: UM.Theme.getSize("account_button").width width: UM.Theme.getSize("account_button").width
height: UM.Theme.getSize("account_button").height height: UM.Theme.getSize("account_button").height
text: catalog.i18nc("@button", "Manage account") text: catalog.i18nc("@button", "Manage account")
color: UM.Theme.getColor("secondary")
hoverColor: UM.Theme.getColor("secondary")
textColor: UM.Theme.getColor("main_window_header_button_text_active")
textHoverColor: UM.Theme.getColor("main_window_header_button_text_active")
onClicked: Qt.openUrlExternally("https://account.ultimaker.com") onClicked: Qt.openUrlExternally("https://account.ultimaker.com")
fixedWidthMode: true fixedWidthMode: true
} }
Cura.ActionButton Cura.PrimaryButton
{ {
width: UM.Theme.getSize("account_button").width width: UM.Theme.getSize("account_button").width
height: UM.Theme.getSize("account_button").height height: UM.Theme.getSize("account_button").height

5
resources/qml/ActionPanel/OutputDevicesActionButton.qml
View file

@ -12,13 +12,12 @@ Item
{ {
id: widget id: widget
Cura.ActionButton Cura.PrimaryButton
{ {
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

9
resources/qml/ActionPanel/OutputProcessWidget.qml
View file

@ -101,18 +101,13 @@ Column
spacing: UM.Theme.getSize("default_margin").width spacing: UM.Theme.getSize("default_margin").width
width: parent.width width: parent.width
Cura.ActionButton Cura.SecondaryButton
{ {
id: previewStageShortcut id: previewStageShortcut
leftPadding: UM.Theme.getSize("default_margin").width
rightPadding: UM.Theme.getSize("default_margin").width
height: UM.Theme.getSize("action_panel_button").height height: UM.Theme.getSize("action_panel_button").height
text: catalog.i18nc("@button", "Preview") text: catalog.i18nc("@button", "Preview")
color: UM.Theme.getColor("secondary")
hoverColor: UM.Theme.getColor("secondary")
textColor: UM.Theme.getColor("primary")
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"

49
resources/qml/ActionPanel/SliceProcessWidget.qml
View file

@ -81,36 +81,41 @@ Column
} }
} }
Cura.ActionButton
{
id: prepareButton
width: parent.width
height: UM.Theme.getSize("action_panel_button").height
fixedWidthMode: true
Item
{
id: prepareButtons
// Get the current value from the preferences // Get the current value from the preferences
property bool autoSlice: UM.Preferences.getValue("general/auto_slice") property bool autoSlice: UM.Preferences.getValue("general/auto_slice")
// 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 isSlicing: [UM.Backend.NotStarted, UM.Backend.Error].indexOf(widget.backendState) == -1 width: parent.width
height: UM.Theme.getSize("action_panel_button").height
text: isSlicing ? catalog.i18nc("@button", "Cancel") : catalog.i18nc("@button", "Slice")
enabled: !autoSlice && !disabledSlice
visible: !autoSlice visible: !autoSlice
Cura.PrimaryButton
{
id: sliceButton
fixedWidthMode: true
anchors.fill: parent
text: catalog.i18nc("@button", "Slice")
enabled: !autoSlice && widget.backendState != UM.Backend.Error
visible: widget.backendState == UM.Backend.NotStarted || widget.backendState == UM.Backend.Error
onClicked: sliceOrStopSlicing()
}
color: isSlicing ? UM.Theme.getColor("secondary"): UM.Theme.getColor("primary") Cura.SecondaryButton
textColor: isSlicing ? UM.Theme.getColor("primary"): UM.Theme.getColor("button_text") {
outlineColor: "transparent" id: cancelButton
disabledColor: UM.Theme.getColor("action_button_disabled") fixedWidthMode: true
textDisabledColor: UM.Theme.getColor("action_button_disabled_text") anchors.fill: parent
shadowEnabled: true text: catalog.i18nc("@button", "Cancel")
shadowColor: isSlicing ? UM.Theme.getColor("secondary_shadow") : enabled ? UM.Theme.getColor("action_button_shadow"): UM.Theme.getColor("action_button_disabled_shadow") enabled: sliceButton.enabled
visible: !sliceButton.visible
onClicked: sliceOrStopSlicing() onClicked: sliceOrStopSlicing()
}
} }
// React when the user changes the preference of having the auto slice enabled // React when the user changes the preference of having the auto slice enabled
Connections Connections
{ {
@ -118,7 +123,7 @@ Column
onPreferenceChanged: onPreferenceChanged:
{ {
var autoSlice = UM.Preferences.getValue("general/auto_slice") var autoSlice = UM.Preferences.getValue("general/auto_slice")
prepareButton.autoSlice = autoSlice prepareButtons.autoSlice = autoSlice
} }
} }

18
resources/qml/PrimaryButton.qml Normal file
View file

@ -0,0 +1,18 @@
import QtQuick 2.2
import QtQuick.Controls 1.1
import UM 1.4 as UM
import Cura 1.1 as Cura
Cura.ActionButton
{
shadowEnabled: true
shadowColor: enabled ? UM.Theme.getColor("primary_button_shadow"): UM.Theme.getColor("action_button_disabled_shadow")
color: UM.Theme.getColor("primary_button")
textColor: UM.Theme.getColor("primary_button_text")
outlineColor: "transparent"
disabledColor: UM.Theme.getColor("action_button_disabled")
textDisabledColor: UM.Theme.getColor("action_button_disabled_text")
hoverColor: UM.Theme.getColor("primary_button_hover")
}

18
resources/qml/SecondaryButton.qml Normal file
View file

@ -0,0 +1,18 @@
import QtQuick 2.2
import QtQuick.Controls 1.1
import UM 1.4 as UM
import Cura 1.1 as Cura
Cura.ActionButton
{
shadowEnabled: true
shadowColor: enabled ? UM.Theme.getColor("secondary_button_shadow"): UM.Theme.getColor("action_button_disabled_shadow")
color: UM.Theme.getColor("secondary_button")
textColor: UM.Theme.getColor("secondary_button_text")
outlineColor: "transparent"
disabledColor: UM.Theme.getColor("action_button_disabled")
textDisabledColor: UM.Theme.getColor("action_button_disabled_text")
hoverColor: UM.Theme.getColor("secondary_button_hover")
}

10
resources/themes/cura-light/theme.json
View file

@ -90,6 +90,16 @@
"secondary": [245, 245, 245, 255], "secondary": [245, 245, 245, 255],
"secondary_shadow": [228, 228, 228, 255], "secondary_shadow": [228, 228, 228, 255],
"primary_button": [38,113,231,255],
"primary_button_shadow": [27,95,202, 255],
"primary_button_hover": [81,145,247, 255],
"primary_button_text": [255, 255, 255, 255],
"secondary_button": [240,240,240, 255],
"secondary_button_shadow": [228, 228, 228, 255],
"secondary_button_hover": [228,228,228, 255],
"secondary_button_text": [30,102,215, 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],
"main_window_header_button_text_inactive": [255, 255, 255, 255], "main_window_header_button_text_inactive": [255, 255, 255, 255],