status-im/status-desktop
2
0
Fork 0
mirror of https://github.com/status-im/status-desktop.git synced 2025-02-17 09:08:49 +00:00
Code Issues Projects Releases Wiki Activity

refactor(@desktop/onboarding): use StatusQ StatusButton

Browse Source
This commit is contained in:
Pascal Precht 2021-10-20 14:23:58 +02:00 committed by Iuri Matias
parent 6db7b5be44
commit 33bc29961a
7 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/app/AppLayouts/Onboarding/popups/BeforeGetStartedModal.qml
View File

@ -4,10 +4,10 @@ import QtQuick.Layouts 1.14
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"
// TODO: replace with StatusModal // TODO: replace with StatusModal
ModalPopup { ModalPopup {

4
ui/app/AppLayouts/Onboarding/popups/ConfirmAddExistingKeyModal.qml
View File

@ -3,10 +3,10 @@ import QtQuick.Controls 2.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"
// TODO: replace with StatusModal // TODO: replace with StatusModal
ModalPopup { ModalPopup {

4
ui/app/AppLayouts/Onboarding/popups/InvalidSeedPhraseModal.qml
View File

@ -3,8 +3,8 @@ import QtQuick.Controls 2.13
import utils 1.0 import utils 1.0
import "../../../../shared" import StatusQ.Controls 0.1
import "../../../../shared/status"
import "../../../../shared/popups" import "../../../../shared/popups"
import "../../../../shared/panels" import "../../../../shared/panels"

6
ui/app/AppLayouts/Onboarding/popups/MnemonicRecoverySuccessModal.qml
View File

@ -3,7 +3,9 @@ import QtQuick.Controls 2.13
import QtQuick.Dialogs 1.3 import QtQuick.Dialogs 1.3
import utils 1.0 import utils 1.0
import "../../../../shared"
import StatusQ.Controls 0.1 as StatusQControls
import "../../../../shared/status" import "../../../../shared/status"
import "../../../../shared/panels" import "../../../../shared/panels"
import "../../../../shared/popups" import "../../../../shared/popups"
@ -66,7 +68,7 @@ ModalPopup {
width: parent.width width: parent.width
height: reencryptBtn.height height: reencryptBtn.height
StatusButton { StatusQControls.StatusButton {
id: reencryptBtn id: reencryptBtn
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.topMargin: Style.current.padding anchors.topMargin: Style.current.padding

5
ui/app/AppLayouts/Onboarding/popups/SelectAnotherAccountModal.qml
View File

@ -2,9 +2,10 @@ 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 StatusQ.Controls 0.1
import "../../../../shared/popups" import "../../../../shared/popups"
import "../../../../shared/status"
import "../panels" import "../panels"
import "../stores" import "../stores"

9
ui/app/AppLayouts/Onboarding/views/KeysMainView.qml
View File

@ -2,9 +2,10 @@ import QtQuick 2.13
import QtQuick.Controls 2.13 import QtQuick.Controls 2.13
import QtQuick.Controls.Universal 2.12 import QtQuick.Controls.Universal 2.12
import StatusQ.Controls 0.1
import "../../../../shared" import "../../../../shared"
import "../../../../shared/panels" import "../../../../shared/panels"
import "../../../../shared/status"
import "../popups" import "../popups"
import utils 1.0 import utils 1.0
@ -92,17 +93,16 @@ Page {
text: qsTrId("im-new,-generate-keys") text: qsTrId("im-new,-generate-keys")
} }
StatusButton { StatusFlatButton {
id: btnExistingKey id: btnExistingKey
//% "Access existing key" //% "Access existing key"
text: qsTrId("access-existing-key") text: qsTrId("access-existing-key")
anchors.top: btnGenKey.bottom anchors.top: btnGenKey.bottom
anchors.topMargin: Style.current.padding anchors.topMargin: Style.current.padding
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
type: "secondary"
} }
StatusButton { StatusFlatButton {
id: btnKeycard id: btnKeycard
//% "I have a Keycard" //% "I have a Keycard"
text: qsTr("I have a Keycard") text: qsTr("I have a Keycard")
@ -110,7 +110,6 @@ Page {
anchors.topMargin: Style.current.padding anchors.topMargin: Style.current.padding
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
visible: isExperimental === "1" || appSettings.isKeycardEnabled visible: isExperimental === "1" || appSettings.isKeycardEnabled
type: "secondary"
} }
} }
} }

7
ui/app/AppLayouts/Onboarding/views/LoginView.qml
View File

@ -4,7 +4,8 @@ import QtQuick.Layouts 1.13
import QtQuick.Dialogs 1.3 import QtQuick.Dialogs 1.3
import QtGraphicalEffects 1.13 import QtGraphicalEffects 1.13
import "../../../../shared" import StatusQ.Controls 0.1 as StatusQControls
import "../../../../shared/popups" import "../../../../shared/popups"
import "../../../../shared/panels" import "../../../../shared/panels"
import "../../../../shared/controls" import "../../../../shared/controls"
@ -246,15 +247,13 @@ Item {
} }
} }
StatusButton { StatusQControls.StatusFlatButton {
id: generateKeysLinkText id: generateKeysLinkText
//% "Generate new keys" //% "Generate new keys"
text: qsTrId("generate-new-keys") text: qsTrId("generate-new-keys")
anchors.top: txtPassword.visible? txtPassword.bottom : changeAccountBtn.bottom anchors.top: txtPassword.visible? txtPassword.bottom : changeAccountBtn.bottom
anchors.topMargin: 16 anchors.topMargin: 16
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
font.pixelSize: 13
type: "secondary"
onClicked: { onClicked: {
setCurrentFlow(false); setCurrentFlow(false);
onGenKeyClicked() onGenKeyClicked()