Fixes #15871 Adds a beta tag to the pairing screens on onboarding and settings
This commit is contained in:
parent
fdd743a817
commit
298a6c3477
|
@ -231,6 +231,14 @@ Item {
|
||||||
root.startupStore.doPrimaryAction()
|
root.startupStore.doPrimaryAction()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
StatusBetaTag {
|
||||||
|
id: betaTagButton1
|
||||||
|
visible: true
|
||||||
|
anchors.left: button1.right
|
||||||
|
anchors.leftMargin: 8
|
||||||
|
anchors.verticalCenter: button1.verticalCenter
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
StatusBaseText {
|
StatusBaseText {
|
||||||
|
@ -334,6 +342,10 @@ Item {
|
||||||
target: button1
|
target: button1
|
||||||
text: qsTr("Scan or enter a sync code")
|
text: qsTr("Scan or enter a sync code")
|
||||||
}
|
}
|
||||||
|
PropertyChanges {
|
||||||
|
target: betaTagButton1
|
||||||
|
visible: true
|
||||||
|
}
|
||||||
PropertyChanges {
|
PropertyChanges {
|
||||||
target: button2
|
target: button2
|
||||||
text: qsTr("I don’t have other device")
|
text: qsTr("I don’t have other device")
|
||||||
|
@ -365,6 +377,10 @@ Item {
|
||||||
target: button1
|
target: button1
|
||||||
text: ""
|
text: ""
|
||||||
}
|
}
|
||||||
|
PropertyChanges {
|
||||||
|
target: betaTagButton1
|
||||||
|
visible: false
|
||||||
|
}
|
||||||
PropertyChanges {
|
PropertyChanges {
|
||||||
target: button2
|
target: button2
|
||||||
text: qsTr("Login with Keycard")
|
text: qsTr("Login with Keycard")
|
||||||
|
@ -396,6 +412,10 @@ Item {
|
||||||
target: button1
|
target: button1
|
||||||
text: qsTr("Generate new keys")
|
text: qsTr("Generate new keys")
|
||||||
}
|
}
|
||||||
|
PropertyChanges {
|
||||||
|
target: betaTagButton1
|
||||||
|
visible: false
|
||||||
|
}
|
||||||
PropertyChanges {
|
PropertyChanges {
|
||||||
target: button2
|
target: button2
|
||||||
text: qsTr("Generate keys for a new Keycard")
|
text: qsTr("Generate keys for a new Keycard")
|
||||||
|
@ -427,6 +447,10 @@ Item {
|
||||||
target: button1
|
target: button1
|
||||||
text: qsTr("Import a seed phrase")
|
text: qsTr("Import a seed phrase")
|
||||||
}
|
}
|
||||||
|
PropertyChanges {
|
||||||
|
target: betaTagButton1
|
||||||
|
visible: false
|
||||||
|
}
|
||||||
PropertyChanges {
|
PropertyChanges {
|
||||||
target: button2
|
target: button2
|
||||||
text: qsTr("Import a seed phrase into a new Keycard")
|
text: qsTr("Import a seed phrase into a new Keycard")
|
||||||
|
@ -458,6 +482,10 @@ Item {
|
||||||
target: button1
|
target: button1
|
||||||
text: qsTr("Try to fetch profile again")
|
text: qsTr("Try to fetch profile again")
|
||||||
}
|
}
|
||||||
|
PropertyChanges {
|
||||||
|
target: betaTagButton1
|
||||||
|
visible: false
|
||||||
|
}
|
||||||
PropertyChanges {
|
PropertyChanges {
|
||||||
target: button2
|
target: button2
|
||||||
text: qsTr("Create new profile with the same chatkey")
|
text: qsTr("Create new profile with the same chatkey")
|
||||||
|
@ -487,6 +515,10 @@ Item {
|
||||||
target: button1
|
target: button1
|
||||||
text: qsTr("Continue")
|
text: qsTr("Continue")
|
||||||
}
|
}
|
||||||
|
PropertyChanges {
|
||||||
|
target: betaTagButton1
|
||||||
|
visible: false
|
||||||
|
}
|
||||||
PropertyChanges {
|
PropertyChanges {
|
||||||
target: button2
|
target: button2
|
||||||
text: ""
|
text: ""
|
||||||
|
@ -518,6 +550,10 @@ Item {
|
||||||
target: button1
|
target: button1
|
||||||
text: qsTr("Create replacement Keycard with seed phrase")
|
text: qsTr("Create replacement Keycard with seed phrase")
|
||||||
}
|
}
|
||||||
|
PropertyChanges {
|
||||||
|
target: betaTagButton1
|
||||||
|
visible: false
|
||||||
|
}
|
||||||
PropertyChanges {
|
PropertyChanges {
|
||||||
target: button2
|
target: button2
|
||||||
text: qsTr("Start using account without keycard")
|
text: qsTr("Start using account without keycard")
|
||||||
|
|
|
@ -111,7 +111,8 @@ QtObject {
|
||||||
isExperimental: true})
|
isExperimental: true})
|
||||||
append({subsection: Constants.settingsSubsection.syncingSettings,
|
append({subsection: Constants.settingsSubsection.syncingSettings,
|
||||||
text: qsTr("Syncing"),
|
text: qsTr("Syncing"),
|
||||||
icon: "rotate"})
|
icon: "rotate",
|
||||||
|
isExperimental: true})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -169,17 +169,27 @@ SettingsContentBase {
|
||||||
|
|
||||||
spacing: 17
|
spacing: 17
|
||||||
|
|
||||||
StatusBaseText {
|
Item {
|
||||||
|
Layout.alignment: Qt.AlignHCenter
|
||||||
|
height: syncNewDeviceText.height
|
||||||
|
width: syncNewDeviceText.width
|
||||||
|
Layout.topMargin: -8
|
||||||
|
|
||||||
|
StatusBaseText {
|
||||||
|
id: syncNewDeviceText
|
||||||
objectName: "syncNewDeviceTextLabel"
|
objectName: "syncNewDeviceTextLabel"
|
||||||
|
|
||||||
Layout.fillWidth: true
|
|
||||||
Layout.topMargin: -8
|
|
||||||
horizontalAlignment: Text.AlignHCenter
|
|
||||||
color: Theme.palette.primaryColor1
|
color: Theme.palette.primaryColor1
|
||||||
font.pixelSize: 17
|
font.pixelSize: 17
|
||||||
font.weight: Font.Bold
|
font.weight: Font.Bold
|
||||||
text: qsTr("Sync a New Device")
|
text: qsTr("Sync a New Device")
|
||||||
|
|
||||||
|
StatusBetaTag {
|
||||||
|
anchors.left: parent.right
|
||||||
|
anchors.leftMargin: 8
|
||||||
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
StatusBaseText {
|
StatusBaseText {
|
||||||
|
|
|
@ -3,6 +3,7 @@ import QtQuick.Layouts 1.14
|
||||||
|
|
||||||
import StatusQ.Core 0.1
|
import StatusQ.Core 0.1
|
||||||
import StatusQ.Core.Theme 0.1
|
import StatusQ.Core.Theme 0.1
|
||||||
|
import StatusQ.Components 0.1
|
||||||
import StatusQ.Controls 0.1
|
import StatusQ.Controls 0.1
|
||||||
import StatusQ.Controls.Validators 0.1
|
import StatusQ.Controls.Validators 0.1
|
||||||
|
|
||||||
|
@ -44,6 +45,12 @@ ColumnLayout {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
StatusBetaTag {
|
||||||
|
anchors.left: switchTabBar.right
|
||||||
|
anchors.leftMargin: 8
|
||||||
|
anchors.verticalCenter: switchTabBar.verticalCenter
|
||||||
|
}
|
||||||
|
|
||||||
StackLayout {
|
StackLayout {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
Layout.preferredHeight: Math.max(syncQr.implicitHeight, syncCode.implicitHeight)
|
Layout.preferredHeight: Math.max(syncQr.implicitHeight, syncCode.implicitHeight)
|
||||||
|
|
Loading…
Reference in New Issue