From b788f79509567b565469ddedea5a045cb41280b2 Mon Sep 17 00:00:00 2001 From: Sander van Grieken Date: Mon, 6 Mar 2023 18:05:54 +0100 Subject: [PATCH] qml: styling, padding various wizardcomponents --- electrum/gui/qml/components/wizard/WCConfirmSeed.qml | 1 + electrum/gui/qml/components/wizard/WCCreateSeed.qml | 10 +++++++++- electrum/gui/qml/components/wizard/WCHaveSeed.qml | 7 ++++++- electrum/gui/qml/components/wizard/WCImport.qml | 3 +-- electrum/gui/qml/components/wizard/WCMultisig.qml | 2 -- 5 files changed, 17 insertions(+), 6 deletions(-) diff --git a/electrum/gui/qml/components/wizard/WCConfirmSeed.qml b/electrum/gui/qml/components/wizard/WCConfirmSeed.qml index 64b35f6b7..c81727f1e 100644 --- a/electrum/gui/qml/components/wizard/WCConfirmSeed.qml +++ b/electrum/gui/qml/components/wizard/WCConfirmSeed.qml @@ -34,6 +34,7 @@ WizardComponent { } Label { + Layout.topMargin: constants.paddingMedium text: qsTr('Confirm your seed (re-enter)') } diff --git a/electrum/gui/qml/components/wizard/WCCreateSeed.qml b/electrum/gui/qml/components/wizard/WCCreateSeed.qml index 202209b04..096a016b4 100644 --- a/electrum/gui/qml/components/wizard/WCCreateSeed.qml +++ b/electrum/gui/qml/components/wizard/WCCreateSeed.qml @@ -48,7 +48,12 @@ WizardComponent { Layout.fillWidth: true iconStyle: InfoTextArea.IconStyle.Warn } - Label { text: qsTr('Your wallet generation seed is:') } + + Label { + Layout.topMargin: constants.paddingMedium + text: qsTr('Your wallet generation seed is:') + } + SeedTextArea { id: seedtext readOnly: true @@ -60,16 +65,19 @@ WizardComponent { visible: seedtext.text == '' } } + CheckBox { id: extendcb text: qsTr('Extend seed with custom words') } + TextField { id: customwordstext visible: extendcb.checked Layout.fillWidth: true placeholderText: qsTr('Enter your custom word(s)') } + Component.onCompleted : { setWarningText(12) } diff --git a/electrum/gui/qml/components/wizard/WCHaveSeed.qml b/electrum/gui/qml/components/wizard/WCHaveSeed.qml index d8e7ed272..08246665d 100644 --- a/electrum/gui/qml/components/wizard/WCHaveSeed.qml +++ b/electrum/gui/qml/components/wizard/WCHaveSeed.qml @@ -141,6 +141,7 @@ WizardComponent { visible: !is2fa text: qsTr('Seed Type') } + ComboBox { id: seed_variant_cb visible: !is2fa @@ -157,15 +158,19 @@ WizardComponent { checkValid() } } + InfoTextArea { id: infotext Layout.fillWidth: true Layout.columnSpan: 2 } + Label { - text: cosigner ? qsTr('Enter cosigner seed') : qsTr('Enter your seed') + Layout.topMargin: constants.paddingMedium Layout.columnSpan: 2 + text: cosigner ? qsTr('Enter cosigner seed') : qsTr('Enter your seed') } + SeedTextArea { id: seedtext Layout.fillWidth: true diff --git a/electrum/gui/qml/components/wizard/WCImport.qml b/electrum/gui/qml/components/wizard/WCImport.qml index 86bddc5d0..baa0546b6 100644 --- a/electrum/gui/qml/components/wizard/WCImport.qml +++ b/electrum/gui/qml/components/wizard/WCImport.qml @@ -26,14 +26,13 @@ WizardComponent { ColumnLayout { width: parent.width - Label { text: qsTr('Import Bitcoin Addresses') } - InfoTextArea { Layout.preferredWidth: parent.width text: qsTr('Enter a list of Bitcoin addresses (this will create a watching-only wallet), or a list of private keys.') } RowLayout { + Layout.topMargin: constants.paddingMedium TextArea { id: import_ta Layout.fillWidth: true diff --git a/electrum/gui/qml/components/wizard/WCMultisig.qml b/electrum/gui/qml/components/wizard/WCMultisig.qml index 2a1e14406..0ed56ffaf 100644 --- a/electrum/gui/qml/components/wizard/WCMultisig.qml +++ b/electrum/gui/qml/components/wizard/WCMultisig.qml @@ -39,8 +39,6 @@ WizardComponent { id: rootLayout width: parent.width - Label { text: qsTr('Multisig wallet') } - InfoTextArea { Layout.preferredWidth: parent.width text: qsTr('Choose the number of participants, and the number of signatures needed to unlock funds in your wallet.')