From 317777e7d7fcb13b5bc716026dcae2ba4842270b Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Fri, 18 Dec 2020 08:53:35 +0100 Subject: [PATCH] Merge bitcoin-core/gui#171: Use layout manager for Create Wallet dialog d4feb6812a2707ef85d75dda4372086ec62eb922 qt: Use layout manager for Create Wallet dialog (Hennadii Stepanov) Pull request description: On master (e75f91eae3936269b40b4bfdfe540d5526270936) not using layout manager causes problems with resizing: ![Screenshot from 2021-01-01 13-03-13](https://user-images.githubusercontent.com/32963518/103437728-ce1d4580-4c33-11eb-8915-1e9482775653.png) ![Screenshot from 2021-01-01 13-03-26](https://user-images.githubusercontent.com/32963518/103437730-d6758080-4c33-11eb-9e0f-87d0dd487fcb.png) Also text labels are not resized properly on some window managers (https://github.com/bitcoin/bitcoin/issues/20777), or if their lengths are changed (after translation). This PR introduces a standard layout manager for the "Create Wallet" dialog that fixes all layout issues (actually, the `createwalletdialog.ui` has been re-written from scratch): ![Screenshot from 2021-01-01 13-10-03](https://user-images.githubusercontent.com/32963518/103437822-d0cc6a80-4c34-11eb-84fd-fcb10a16d9ef.png) ![Screenshot from 2021-01-06 23-50-36](https://user-images.githubusercontent.com/32963518/103823090-0b416780-507a-11eb-89dd-3f48a358e168.png) Additional visual changes: - advanced options are grouped in `QGroupBox` (https://github.com/bitcoin-core/gui/pull/96#issuecomment-726337165) - enabled the [size grip](https://doc.qt.io/qt-5/qsizegrip.html#details) Fix https://github.com/bitcoin/bitcoin/issues/20777 ACKs for top commit: jarolrod: ACK d4feb6812a2707ef85d75dda4372086ec62eb922 Sjors: re-tACK d4feb6812a2707ef85d75dda4372086ec62eb922 promag: Tested ACK d4feb6812a2707ef85d75dda4372086ec62eb922 on macos. Tree-SHA512: 4c055962e49f88624900b880b33a866976d224628784593428b712d2e94563d77ddefddea3397134d20e72f738a8cf9aa885c1272fd9ffc90213c104435fb9f4 --- src/qt/forms/createwalletdialog.ui | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/src/qt/forms/createwalletdialog.ui b/src/qt/forms/createwalletdialog.ui index 22cf002070..c7b06c3a04 100644 --- a/src/qt/forms/createwalletdialog.ui +++ b/src/qt/forms/createwalletdialog.ui @@ -100,22 +100,14 @@ - - - - 20 - 140 - 171 - 22 - - - - Use descriptors for scriptPubKey management - - - Descriptor Wallet - - + + + Use descriptors for scriptPubKey management + + + Descriptor Wallet + +