GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-09-27 14:03:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Replace buttons by PrimaryButtons for cloud sync dialogs

Browse Source 
CURA-6984
This commit is contained in:
Nino van Hooff 2020-01-17 11:44:57 +01:00
parent 4e8534b93b
commit 9dd50c8804
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/Toolbox/resources/qml/dialogs/CompatibilityDialog.qml
View File

@ -152,7 +152,7 @@ UM.Dialog{
} // End of ScrollView } // End of ScrollView
Cura.ActionButton Cura.PrimaryButton
{ {
id: nextButton id: nextButton
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
@ -160,6 +160,8 @@ UM.Dialog{
anchors.margins: UM.Theme.getSize("default_margin").height anchors.margins: UM.Theme.getSize("default_margin").height
text: catalog.i18nc("@button", "Next") text: catalog.i18nc("@button", "Next")
onClicked: accept() onClicked: accept()
leftPadding: UM.Theme.getSize("dialog_primary_button_padding").width
rightPadding: UM.Theme.getSize("dialog_primary_button_padding").width
} }
} }
} }

21
plugins/Toolbox/resources/qml/dialogs/ToolboxLicenseDialog.qml
View File

@ -10,6 +10,7 @@ import QtQuick.Controls.Styles 1.4
// TODO: Switch to QtQuick.Controls 2.x and remove QtQuick.Controls.Styles // TODO: Switch to QtQuick.Controls 2.x and remove QtQuick.Controls.Styles
import UM 1.1 as UM import UM 1.1 as UM
import Cura 1.6 as Cura
UM.Dialog UM.Dialog
{ {
@ -51,18 +52,22 @@ UM.Dialog
} }
rightButtons: rightButtons:
[ [
Button Cura.PrimaryButton
{ {
id: acceptButton leftPadding: UM.Theme.getSize("dialog_primary_button_padding").width
anchors.margins: UM.Theme.getSize("default_margin").width rightPadding: UM.Theme.getSize("dialog_primary_button_padding").width
text: catalog.i18nc("@action:button", "Accept")
text: catalog.i18nc("@button", "Agree")
onClicked: { handler.onLicenseAccepted() } onClicked: { handler.onLicenseAccepted() }
}, }
Button ]
leftButtons:
[
Cura.SecondaryButton
{ {
id: declineButton id: declineButton
anchors.margins: UM.Theme.getSize("default_margin").width text: catalog.i18nc("@button", "Decline and remove from account")
text: catalog.i18nc("@action:button", "Decline")
onClicked: { handler.onLicenseDeclined() } onClicked: { handler.onLicenseDeclined() }
} }
] ]

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

@ -520,6 +520,7 @@
"action_button": [15.0, 2.5], "action_button": [15.0, 2.5],
"action_button_icon": [1.0, 1.0], "action_button_icon": [1.0, 1.0],
"action_button_radius": [0.15, 0.15], "action_button_radius": [0.15, 0.15],
"dialog_primary_button_padding": [3.0, 0],
"radio_button": [1.3, 1.3], "radio_button": [1.3, 1.3],