status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

uiux(Wallet): use StatusButton instead of StyledButton 

`StyledButton` is considered obsolete and by using `StatusButton` we're getting
the expected and correct look & feel of buttons by default.

Closes #1627
This commit is contained in:
Pascal Precht 2021-01-12 11:58:53 +01:00 committed by Iuri Matias
parent 6705e3f8c7
commit b2636a0807
4 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ui/app/AppLayouts/Wallet/components/AddAccountWithPrivateKey.qml
View File

@ -3,6 +3,7 @@ import QtQuick.Controls 2.13
import QtQuick.Dialogs 1.3
import "../../../../imports"
import "../../../../shared"
import "../../../../shared/status"
ModalPopup {
id: popup
@ -100,17 +101,15 @@ ModalPopup {
anchors.right: parent.right
}
footer: StyledButton {
footer: StatusButton {
anchors.top: parent.top
anchors.right: parent.right
anchors.rightMargin: Style.current.padding
label: loading ?
text: loading ?
//% "Loading..."
qsTrId("loading") :
//% "Add account >"
qsTrId("add-account")
qsTr("Add account")
disabled: loading || passwordInput.text === "" || accountNameInput.text === "" || accountPKeyInput.text === ""
enabled: !loading && passwordInput.text !== "" && accountNameInput.text !== "" && accountPKeyInput.text !== ""
MessageDialog {
id: accountError

11
ui/app/AppLayouts/Wallet/components/AddAccountWithSeed.qml
View File

@ -3,6 +3,7 @@ import QtQuick.Controls 2.13
import QtQuick.Dialogs 1.3
import "../../../../imports"
import "../../../../shared"
import "../../../../shared/status"
ModalPopup {
id: popup
@ -113,17 +114,15 @@ ModalPopup {
anchors.right: parent.right
}
footer: StyledButton {
footer: StatusButton {
anchors.top: parent.top
anchors.right: parent.right
anchors.rightMargin: Style.current.padding
label: loading ?
text: loading ?
//% "Loading..."
qsTrId("loading") :
//% "Add account >"
qsTrId("add-account")
qsTr("Add account")
disabled: loading || passwordInput.text === "" || accountNameInput.text === "" || accountSeedInput.text === ""
enabled: !loading && passwordInput.text !== "" && accountNameInput.text !== "" && accountSeedInput.text !== ""
MessageDialog {
id: accountError

11
ui/app/AppLayouts/Wallet/components/AddWatchOnlyAccount.qml
View File

@ -3,6 +3,7 @@ import QtQuick.Controls 2.13
import QtQuick.Dialogs 1.3
import "../../../../imports"
import "../../../../shared"
import "../../../../shared/status"
ModalPopup {
id: popup
@ -74,17 +75,15 @@ ModalPopup {
anchors.right: parent.right
}
footer: StyledButton {
footer: StatusButton {
anchors.top: parent.top
anchors.right: parent.right
anchors.rightMargin: Style.current.padding
label: loading ?
text: loading ?
//% "Loading..."
qsTrId("loading") :
//% "Add account >"
qsTrId("add-account")
qsTr("Add account")
disabled: loading || addressInput.text === "" || accountNameInput.text === ""
enabled: !loading && addressInput.text !== "" && accountNameInput.text !== ""
MessageDialog {
id: accountError

11
ui/app/AppLayouts/Wallet/components/GenerateAccountModal.qml
View File

@ -3,6 +3,7 @@ import QtQuick.Controls 2.13
import QtQuick.Dialogs 1.3
import "../../../../imports"
import "../../../../shared"
import "../../../../shared/status"
ModalPopup {
id: popup
@ -73,17 +74,15 @@ ModalPopup {
anchors.right: parent.right
}
footer: StyledButton {
footer: StatusButton {
anchors.top: parent.top
anchors.right: parent.right
anchors.rightMargin: Style.current.padding
label: loading ?
text: loading ?
//% "Loading..."
qsTrId("loading") :
//% "Add account >"
qsTrId("add-account")
qsTr("Add account")
disabled: loading || passwordInput.text === "" || accountNameInput.text === ""
enabled: !loading && passwordInput.text !== "" && accountNameInput.text !== ""
MessageDialog {
id: accountError