mirror of
https://github.com/status-im/status-desktop.git
synced 2025-02-22 19:48:52 +00:00
fix(Onboarding): fix wording and terminology in LoginBySyncingFlow
- basically Sync -> Pair where needed
This commit is contained in:
parent
311657428a
commit
fdb5fb5077
@ -17,7 +17,7 @@ OnboardingPage {
|
||||
|
||||
signal syncProceedWithConnectionString(string connectionString)
|
||||
|
||||
title: qsTr("Log in by syncing")
|
||||
title: qsTr("Pair devices to sync")
|
||||
|
||||
contentItem: Item {
|
||||
ColumnLayout {
|
||||
@ -35,7 +35,7 @@ OnboardingPage {
|
||||
}
|
||||
StatusBaseText {
|
||||
Layout.fillWidth: true
|
||||
Layout.topMargin: -12
|
||||
Layout.topMargin: -Theme.bigPadding
|
||||
text: qsTr("If you have Status on another device")
|
||||
color: Theme.palette.baseColor1
|
||||
wrapMode: Text.WordWrap
|
||||
@ -47,7 +47,6 @@ OnboardingPage {
|
||||
Layout.alignment: Qt.AlignHCenter
|
||||
validateConnectionString: root.validateConnectionString
|
||||
|
||||
secondTabName: qsTr("Enter code")
|
||||
showBetaTag: false
|
||||
|
||||
onDisplayInstructions: instructionsPopup.createObject(root).open()
|
||||
|
@ -73,7 +73,7 @@ OnboardingPage {
|
||||
when: root.syncState === Onboarding.ProgressState.Failed
|
||||
PropertyChanges {
|
||||
target: root
|
||||
title: "<font color='%1'>".arg(Theme.palette.dangerColor1) + qsTr("Profile syncing failed") + "</font>"
|
||||
title: "<font color='%1'>".arg(Theme.palette.dangerColor1) + qsTr("Failed to pair devices") + "</font>"
|
||||
}
|
||||
PropertyChanges {
|
||||
target: subtitle
|
||||
@ -165,7 +165,7 @@ OnboardingPage {
|
||||
Layout.alignment: Qt.AlignHCenter
|
||||
Layout.preferredWidth: 240
|
||||
id: tryAgainButton
|
||||
text: qsTr("Try to sync again")
|
||||
text: qsTr("Try to pair again")
|
||||
visible: false
|
||||
onClicked: root.restartSyncRequested()
|
||||
}
|
||||
|
@ -126,18 +126,14 @@ ColumnLayout {
|
||||
}
|
||||
}
|
||||
|
||||
StatusFlatButton {
|
||||
StatusButton {
|
||||
Layout.topMargin: Theme.xlPadding
|
||||
Layout.alignment: Qt.AlignHCenter
|
||||
visible: switchTabBar.currentIndex == 0 && !!root.firstInstructionButtonName ||
|
||||
switchTabBar.currentIndex == 1 && !!root.secondInstructionButtonName
|
||||
text: switchTabBar.currentIndex == 0?
|
||||
root.firstInstructionButtonName :
|
||||
root.secondInstructionButtonName
|
||||
text: switchTabBar.currentIndex == 0 ? root.firstInstructionButtonName : root.secondInstructionButtonName
|
||||
font.pixelSize: Theme.additionalTextSize
|
||||
normalColor: "transparent"
|
||||
borderWidth: 1
|
||||
borderColor: Theme.palette.baseColor2
|
||||
isOutline: true
|
||||
onClicked: {
|
||||
root.displayInstructions()
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user