From e99b3023e9946cb7f35ae0f85ad95ead18ae1d45 Mon Sep 17 00:00:00 2001 From: Sander van Grieken Date: Sat, 21 Feb 2026 03:23:30 +0100 Subject: [PATCH] qml: wizard styling, password dialog styling --- .../gui/qml/components/PasswordDialog.qml | 39 ++++++++----------- .../qml/components/wizard/WCConfirmSeed.qml | 1 + electrum/gui/qml/components/wizard/Wizard.qml | 4 ++ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/electrum/gui/qml/components/PasswordDialog.qml b/electrum/gui/qml/components/PasswordDialog.qml index 550f00b23..9f8c0bf19 100644 --- a/electrum/gui/qml/components/PasswordDialog.qml +++ b/electrum/gui/qml/components/PasswordDialog.qml @@ -39,32 +39,23 @@ ElDialog { text: infotext Layout.bottomMargin: constants.paddingMedium Layout.fillWidth: true - } - - Label { - Layout.fillWidth: true - text: qsTr('Password') - color: Material.accentColor + backgroundColor: constants.darkerDialogBackground + compact: true } PasswordField { id: pw_1 - Layout.leftMargin: constants.paddingXLarge - } - - Label { - Layout.fillWidth: true - text: qsTr('Password (again)') - visible: confirmPassword - color: Material.accentColor + Layout.bottomMargin: constants.paddingSmall + placeholderText: qsTr('Password') } PasswordField { id: pw_2 - Layout.leftMargin: constants.paddingXLarge + Layout.bottomMargin: constants.paddingSmall visible: confirmPassword showReveal: false echoMode: pw_1.echoMode + placeholderText: qsTr('Password (again)') } RowLayout { @@ -82,7 +73,7 @@ ElDialog { } PasswordStrengthIndicator { - Layout.fillWidth: true + Layout.preferredWidth: passworddialog.width / 2 password: pw_1.text } } @@ -98,13 +89,17 @@ ElDialog { } } - FlatButton { + DialogButtonContainer { Layout.fillWidth: true - text: qsTr("Ok") - icon.source: '../../icons/confirmed.png' - enabled: confirmPassword ? pw_1.text.length >= 6 && pw_1.text == pw_2.text : true - onClicked: { - passwordEntered(pw_1.text) + + FlatButton { + Layout.fillWidth: true + text: qsTr("Ok") + icon.source: '../../icons/confirmed.png' + enabled: confirmPassword ? pw_1.text.length >= 6 && pw_1.text == pw_2.text : true + onClicked: { + passwordEntered(pw_1.text) + } } } } diff --git a/electrum/gui/qml/components/wizard/WCConfirmSeed.qml b/electrum/gui/qml/components/wizard/WCConfirmSeed.qml index eb239c698..5aebaf0b7 100644 --- a/electrum/gui/qml/components/wizard/WCConfirmSeed.qml +++ b/electrum/gui/qml/components/wizard/WCConfirmSeed.qml @@ -43,6 +43,7 @@ WizardComponent { SeedTextArea { id: confirm Layout.fillWidth: true + Layout.topMargin: constants.paddingSmall placeholderText: qsTr('Enter your seed') onTextChanged: checkValid() } diff --git a/electrum/gui/qml/components/wizard/Wizard.qml b/electrum/gui/qml/components/wizard/Wizard.qml index 36860db69..e231dc570 100644 --- a/electrum/gui/qml/components/wizard/Wizard.qml +++ b/electrum/gui/qml/components/wizard/Wizard.qml @@ -165,6 +165,7 @@ ElDialog { FlatButton { Layout.fillWidth: true Layout.preferredWidth: 1 + Layout.preferredHeight: constants.fingerWidth visible: pages.currentIndex == 0 text: qsTr("Cancel") onClicked: wizard.doReject() @@ -172,6 +173,7 @@ ElDialog { FlatButton { Layout.fillWidth: true Layout.preferredWidth: 1 + Layout.preferredHeight: constants.fingerWidth visible: pages.currentIndex > 0 text: qsTr('Back') onClicked: pages.prev() @@ -179,6 +181,7 @@ ElDialog { FlatButton { Layout.fillWidth: true Layout.preferredWidth: 1 + Layout.preferredHeight: constants.fingerWidth text: qsTr("Next") visible: !pages.lastpage enabled: pages.pagevalid @@ -188,6 +191,7 @@ ElDialog { id: finishButton Layout.fillWidth: true Layout.preferredWidth: 1 + Layout.preferredHeight: constants.fingerWidth text: qsTr("Finish") visible: pages.lastpage enabled: pages.pagevalid