refactor(@desktop/onboarding): use StatusQ StatusButton
This commit is contained in:
parent
6db7b5be44
commit
33bc29961a
|
@ -4,10 +4,10 @@ import QtQuick.Layouts 1.14
|
|||
|
||||
import utils 1.0
|
||||
|
||||
import "../../../../shared"
|
||||
import StatusQ.Controls 0.1
|
||||
|
||||
import "../../../../shared/popups"
|
||||
import "../../../../shared/panels"
|
||||
import "../../../../shared/status"
|
||||
|
||||
// TODO: replace with StatusModal
|
||||
ModalPopup {
|
||||
|
|
|
@ -3,10 +3,10 @@ import QtQuick.Controls 2.13
|
|||
|
||||
import utils 1.0
|
||||
|
||||
import "../../../../shared"
|
||||
import StatusQ.Controls 0.1
|
||||
|
||||
import "../../../../shared/popups"
|
||||
import "../../../../shared/panels"
|
||||
import "../../../../shared/status"
|
||||
|
||||
// TODO: replace with StatusModal
|
||||
ModalPopup {
|
||||
|
|
|
@ -3,8 +3,8 @@ import QtQuick.Controls 2.13
|
|||
|
||||
import utils 1.0
|
||||
|
||||
import "../../../../shared"
|
||||
import "../../../../shared/status"
|
||||
import StatusQ.Controls 0.1
|
||||
|
||||
import "../../../../shared/popups"
|
||||
import "../../../../shared/panels"
|
||||
|
||||
|
|
|
@ -3,7 +3,9 @@ import QtQuick.Controls 2.13
|
|||
import QtQuick.Dialogs 1.3
|
||||
|
||||
import utils 1.0
|
||||
import "../../../../shared"
|
||||
|
||||
import StatusQ.Controls 0.1 as StatusQControls
|
||||
|
||||
import "../../../../shared/status"
|
||||
import "../../../../shared/panels"
|
||||
import "../../../../shared/popups"
|
||||
|
@ -66,7 +68,7 @@ ModalPopup {
|
|||
width: parent.width
|
||||
height: reencryptBtn.height
|
||||
|
||||
StatusButton {
|
||||
StatusQControls.StatusButton {
|
||||
id: reencryptBtn
|
||||
anchors.bottom: parent.bottom
|
||||
anchors.topMargin: Style.current.padding
|
||||
|
|
|
@ -2,9 +2,10 @@ import QtQuick 2.13
|
|||
import QtQuick.Controls 2.13
|
||||
|
||||
import utils 1.0
|
||||
import "../../../../shared"
|
||||
|
||||
import StatusQ.Controls 0.1
|
||||
|
||||
import "../../../../shared/popups"
|
||||
import "../../../../shared/status"
|
||||
|
||||
import "../panels"
|
||||
import "../stores"
|
||||
|
|
|
@ -2,9 +2,10 @@ import QtQuick 2.13
|
|||
import QtQuick.Controls 2.13
|
||||
import QtQuick.Controls.Universal 2.12
|
||||
|
||||
import StatusQ.Controls 0.1
|
||||
|
||||
import "../../../../shared"
|
||||
import "../../../../shared/panels"
|
||||
import "../../../../shared/status"
|
||||
import "../popups"
|
||||
|
||||
import utils 1.0
|
||||
|
@ -92,17 +93,16 @@ Page {
|
|||
text: qsTrId("im-new,-generate-keys")
|
||||
}
|
||||
|
||||
StatusButton {
|
||||
StatusFlatButton {
|
||||
id: btnExistingKey
|
||||
//% "Access existing key"
|
||||
text: qsTrId("access-existing-key")
|
||||
anchors.top: btnGenKey.bottom
|
||||
anchors.topMargin: Style.current.padding
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
type: "secondary"
|
||||
}
|
||||
|
||||
StatusButton {
|
||||
StatusFlatButton {
|
||||
id: btnKeycard
|
||||
//% "I have a Keycard"
|
||||
text: qsTr("I have a Keycard")
|
||||
|
@ -110,7 +110,6 @@ Page {
|
|||
anchors.topMargin: Style.current.padding
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
visible: isExperimental === "1" || appSettings.isKeycardEnabled
|
||||
type: "secondary"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -4,7 +4,8 @@ import QtQuick.Layouts 1.13
|
|||
import QtQuick.Dialogs 1.3
|
||||
import QtGraphicalEffects 1.13
|
||||
|
||||
import "../../../../shared"
|
||||
import StatusQ.Controls 0.1 as StatusQControls
|
||||
|
||||
import "../../../../shared/popups"
|
||||
import "../../../../shared/panels"
|
||||
import "../../../../shared/controls"
|
||||
|
@ -246,15 +247,13 @@ Item {
|
|||
}
|
||||
}
|
||||
|
||||
StatusButton {
|
||||
StatusQControls.StatusFlatButton {
|
||||
id: generateKeysLinkText
|
||||
//% "Generate new keys"
|
||||
text: qsTrId("generate-new-keys")
|
||||
anchors.top: txtPassword.visible? txtPassword.bottom : changeAccountBtn.bottom
|
||||
anchors.topMargin: 16
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
font.pixelSize: 13
|
||||
type: "secondary"
|
||||
onClicked: {
|
||||
setCurrentFlow(false);
|
||||
onGenKeyClicked()
|
||||
|
|
Loading…
Reference in New Issue