mirror of
https://github.com/status-im/status-desktop.git
synced 2025-01-10 22:36:24 +00:00
refactor(@desktop/wallet): replace legacy StatusButton with StatusQ StatusButton
This commit is contained in:
parent
44e43350f1
commit
6db7b5be44
@ -4,9 +4,10 @@ import QtGraphicalEffects 1.13
|
|||||||
import QtQml.Models 2.13
|
import QtQml.Models 2.13
|
||||||
|
|
||||||
import utils 1.0
|
import utils 1.0
|
||||||
import "../../../../shared"
|
|
||||||
|
import StatusQ.Controls 0.1
|
||||||
|
|
||||||
import "../../../../shared/panels"
|
import "../../../../shared/panels"
|
||||||
import "../../../../shared/status"
|
|
||||||
|
|
||||||
ScrollView {
|
ScrollView {
|
||||||
id: collectiblesContent
|
id: collectiblesContent
|
||||||
|
@ -4,13 +4,15 @@ import QtQuick.Layouts 1.13
|
|||||||
import QtQuick.Dialogs 1.3
|
import QtQuick.Dialogs 1.3
|
||||||
|
|
||||||
import utils 1.0
|
import utils 1.0
|
||||||
import "../../../../shared"
|
|
||||||
import "../../../../shared/controls"
|
import "../../../../shared/controls"
|
||||||
import "../../../../shared/popups"
|
import "../../../../shared/popups"
|
||||||
import "../../../../shared/panels"
|
import "../../../../shared/panels"
|
||||||
import "../../../../shared/status"
|
import "../../../../shared/status"
|
||||||
import "../stores"
|
import "../stores"
|
||||||
|
|
||||||
|
import StatusQ.Controls 0.1
|
||||||
|
|
||||||
// TODO: replace with StatusModal
|
// TODO: replace with StatusModal
|
||||||
ModalPopup {
|
ModalPopup {
|
||||||
id: popup
|
id: popup
|
||||||
@ -123,11 +125,7 @@ ModalPopup {
|
|||||||
anchors.rightMargin: Style.current.padding
|
anchors.rightMargin: Style.current.padding
|
||||||
//% "Delete account"
|
//% "Delete account"
|
||||||
text: qsTrId("delete-account")
|
text: qsTrId("delete-account")
|
||||||
bgColor: "transparent"
|
type: StatusBaseButton.Type.Danger
|
||||||
showBorder: true
|
|
||||||
borderColor: Style.current.border
|
|
||||||
hoveredBorderColor: Style.current.transparent
|
|
||||||
type: "warn"
|
|
||||||
|
|
||||||
MessageDialog {
|
MessageDialog {
|
||||||
id: deleteError
|
id: deleteError
|
||||||
|
@ -4,7 +4,8 @@ import QtQuick.Dialogs 1.3
|
|||||||
|
|
||||||
import utils 1.0
|
import utils 1.0
|
||||||
|
|
||||||
import "../../../../shared"
|
import StatusQ.Controls 0.1 as StatusQControls
|
||||||
|
|
||||||
import "../../../../shared/controls"
|
import "../../../../shared/controls"
|
||||||
import "../../../../shared/popups"
|
import "../../../../shared/popups"
|
||||||
import "../../../../shared/panels"
|
import "../../../../shared/panels"
|
||||||
@ -110,7 +111,7 @@ ModalPopup {
|
|||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
}
|
}
|
||||||
|
|
||||||
footer: StatusButton {
|
footer: StatusQControls.StatusButton {
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
text: loading ?
|
text: loading ?
|
||||||
|
@ -4,6 +4,8 @@ import QtQuick.Dialogs 1.3
|
|||||||
|
|
||||||
import utils 1.0
|
import utils 1.0
|
||||||
|
|
||||||
|
import StatusQ.Controls 0.1 as StatusQControls
|
||||||
|
|
||||||
import "../../../../shared"
|
import "../../../../shared"
|
||||||
import "../../../../shared/controls"
|
import "../../../../shared/controls"
|
||||||
import "../../../../shared/popups"
|
import "../../../../shared/popups"
|
||||||
@ -110,7 +112,7 @@ ModalPopup {
|
|||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
}
|
}
|
||||||
|
|
||||||
footer: StatusButton {
|
footer: StatusQControls.StatusButton {
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
text: loading ?
|
text: loading ?
|
||||||
|
@ -4,10 +4,10 @@ import QtQuick.Layouts 1.13
|
|||||||
|
|
||||||
import utils 1.0
|
import utils 1.0
|
||||||
|
|
||||||
import "../../../../shared"
|
import StatusQ.Controls 0.1
|
||||||
|
|
||||||
import "../../../../shared/controls"
|
import "../../../../shared/controls"
|
||||||
import "../../../../shared/popups"
|
import "../../../../shared/popups"
|
||||||
import "../../../../shared/status"
|
|
||||||
import "../stores"
|
import "../stores"
|
||||||
|
|
||||||
// TODO: replace with StatusModal
|
// TODO: replace with StatusModal
|
||||||
|
@ -4,6 +4,8 @@ import QtQuick.Dialogs 1.3
|
|||||||
|
|
||||||
import utils 1.0
|
import utils 1.0
|
||||||
|
|
||||||
|
import StatusQ.Controls 0.1 as StatusQControls
|
||||||
|
|
||||||
import "../../../../shared"
|
import "../../../../shared"
|
||||||
import "../../../../shared/controls"
|
import "../../../../shared/controls"
|
||||||
import "../../../../shared/popups"
|
import "../../../../shared/popups"
|
||||||
@ -82,7 +84,7 @@ ModalPopup {
|
|||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
}
|
}
|
||||||
|
|
||||||
footer: StatusButton {
|
footer: StatusQControls.StatusButton {
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
text: loading ?
|
text: loading ?
|
||||||
|
@ -2,9 +2,10 @@ import QtQuick 2.13
|
|||||||
import QtGraphicalEffects 1.13
|
import QtGraphicalEffects 1.13
|
||||||
|
|
||||||
import utils 1.0
|
import utils 1.0
|
||||||
import "../../../../shared"
|
|
||||||
|
import StatusQ.Controls 0.1
|
||||||
|
|
||||||
import "../../../../shared/popups"
|
import "../../../../shared/popups"
|
||||||
import "../../../../shared/status"
|
|
||||||
import "../panels"
|
import "../panels"
|
||||||
|
|
||||||
// TODO: Replace with StatusModal
|
// TODO: Replace with StatusModal
|
||||||
|
@ -4,6 +4,8 @@ import QtQuick.Dialogs 1.3
|
|||||||
|
|
||||||
import utils 1.0
|
import utils 1.0
|
||||||
|
|
||||||
|
import StatusQ.Controls 0.1 as StatusQControls
|
||||||
|
|
||||||
import "../../../../shared"
|
import "../../../../shared"
|
||||||
import "../../../../shared/controls"
|
import "../../../../shared/controls"
|
||||||
import "../../../../shared/popups"
|
import "../../../../shared/popups"
|
||||||
@ -82,7 +84,7 @@ ModalPopup {
|
|||||||
width: parent.width
|
width: parent.width
|
||||||
}
|
}
|
||||||
|
|
||||||
footer: StatusButton {
|
footer: StatusQControls.StatusButton {
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
text: loading ?
|
text: loading ?
|
||||||
|
@ -2,8 +2,9 @@ import QtQuick 2.13
|
|||||||
import QtQuick.Controls 2.13
|
import QtQuick.Controls 2.13
|
||||||
|
|
||||||
import utils 1.0
|
import utils 1.0
|
||||||
import "../../../../shared"
|
|
||||||
import "../../../../shared/status"
|
import StatusQ.Controls 0.1
|
||||||
|
|
||||||
import "../../../../shared/popups"
|
import "../../../../shared/popups"
|
||||||
import "../panels"
|
import "../panels"
|
||||||
import "../stores"
|
import "../stores"
|
||||||
|
@ -3,10 +3,11 @@ import QtQuick.Controls 2.13
|
|||||||
import QtQuick.Layouts 1.13
|
import QtQuick.Layouts 1.13
|
||||||
|
|
||||||
import utils 1.0
|
import utils 1.0
|
||||||
import "../../../../shared"
|
|
||||||
|
import StatusQ.Controls 0.1
|
||||||
|
|
||||||
import "../../../../shared/popups"
|
import "../../../../shared/popups"
|
||||||
import "../../../../shared/panels"
|
import "../../../../shared/panels"
|
||||||
import "../../../../shared/status"
|
|
||||||
import "../stores"
|
import "../stores"
|
||||||
|
|
||||||
// TODO: replace with StatusModal
|
// TODO: replace with StatusModal
|
||||||
@ -91,12 +92,11 @@ ModalPopup {
|
|||||||
width: parent.width
|
width: parent.width
|
||||||
height: btnRemindLater.height
|
height: btnRemindLater.height
|
||||||
|
|
||||||
StatusButton {
|
StatusFlatButton {
|
||||||
anchors.right: btnRemindLater.left
|
anchors.right: btnRemindLater.left
|
||||||
anchors.rightMargin: Style.current.padding
|
anchors.rightMargin: Style.current.padding
|
||||||
//% "Ok, got it"
|
//% "Ok, got it"
|
||||||
text: qsTrId("ens-got-it")
|
text: qsTrId("ens-got-it")
|
||||||
type: "secondary"
|
|
||||||
onClicked: {
|
onClicked: {
|
||||||
acceptClicked()
|
acceptClicked()
|
||||||
close()
|
close()
|
||||||
|
@ -2,8 +2,9 @@ import QtQuick 2.13
|
|||||||
import QtQuick.Controls 2.13
|
import QtQuick.Controls 2.13
|
||||||
|
|
||||||
import utils 1.0
|
import utils 1.0
|
||||||
import "../../../../shared"
|
|
||||||
import "../../../../shared/status"
|
import StatusQ.Controls 0.1
|
||||||
|
|
||||||
import "../../../../shared/popups"
|
import "../../../../shared/popups"
|
||||||
import "../panels"
|
import "../panels"
|
||||||
import "../stores"
|
import "../stores"
|
||||||
|
@ -4,10 +4,10 @@ import QtQuick.Layouts 1.3
|
|||||||
|
|
||||||
import utils 1.0
|
import utils 1.0
|
||||||
|
|
||||||
import "../../../../shared"
|
import StatusQ.Components 0.1
|
||||||
|
import StatusQ.Controls 0.1
|
||||||
|
|
||||||
import "../../../../shared/panels"
|
import "../../../../shared/panels"
|
||||||
import "../../../../shared/status/core"
|
|
||||||
import "../../../../shared/status"
|
|
||||||
import "../popups"
|
import "../popups"
|
||||||
import "../stores"
|
import "../stores"
|
||||||
import "../controls"
|
import "../controls"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user