Skip to content

Commit 53bbbe5

Browse files
author
MarcoFalke
committed
Merge #171: Use layout manager for Create Wallet dialog
d4feb68 qt: Use layout manager for Create Wallet dialog (Hennadii Stepanov) Pull request description: On master (e75f91e) 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 (bitcoin/bitcoin#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` (#96 (comment)) - enabled the [size grip](https://doc.qt.io/qt-5/qsizegrip.html#details) Fix bitcoin/bitcoin#20777 ACKs for top commit: jarolrod: ACK d4feb68 Sjors: re-tACK d4feb68 promag: Tested ACK d4feb68 on macos. Tree-SHA512: 4c055962e49f88624900b880b33a866976d224628784593428b712d2e94563d77ddefddea3397134d20e72f738a8cf9aa885c1272fd9ffc90213c104435fb9f4
2 parents 45952da + d4feb68 commit 53bbbe5

File tree

1 file changed

+124
-129
lines changed

1 file changed

+124
-129
lines changed

‎src/qt/forms/createwalletdialog.ui

+124-129
Original file line numberDiff line numberDiff line change
@@ -7,140 +7,135 @@
77
<x>0</x>
88
<y>0</y>
99
<width>364</width>
10-
<height>213</height>
10+
<height>249</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
1414
<string>Create Wallet</string>
1515
</property>
16-
<widget class="QDialogButtonBox" name="buttonBox">
17-
<property name="geometry">
18-
<rect>
19-
<x>10</x>
20-
<y>170</y>
21-
<width>341</width>
22-
<height>32</height>
23-
</rect>
24-
</property>
25-
<property name="orientation">
26-
<enum>Qt::Horizontal</enum>
27-
</property>
28-
<property name="standardButtons">
29-
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
30-
</property>
31-
</widget>
32-
<widget class="QLineEdit" name="wallet_name_line_edit">
33-
<property name="geometry">
34-
<rect>
35-
<x>120</x>
36-
<y>20</y>
37-
<width>231</width>
38-
<height>24</height>
39-
</rect>
40-
</property>
41-
<property name="placeholderText">
42-
<string>Wallet</string>
43-
</property>
44-
</widget>
45-
<widget class="QLabel" name="label">
46-
<property name="geometry">
47-
<rect>
48-
<x>20</x>
49-
<y>20</y>
50-
<width>101</width>
51-
<height>21</height>
52-
</rect>
53-
</property>
54-
<property name="text">
55-
<string>Wallet Name</string>
56-
</property>
57-
</widget>
58-
<widget class="QCheckBox" name="encrypt_wallet_checkbox">
59-
<property name="geometry">
60-
<rect>
61-
<x>20</x>
62-
<y>50</y>
63-
<width>220</width>
64-
<height>22</height>
65-
</rect>
66-
</property>
67-
<property name="toolTip">
68-
<string>Encrypt the wallet. The wallet will be encrypted with a passphrase of your choice.</string>
69-
</property>
70-
<property name="text">
71-
<string>Encrypt Wallet</string>
72-
</property>
73-
<property name="checked">
74-
<bool>false</bool>
75-
</property>
76-
</widget>
77-
<widget class="QLabel" name="advanced_options_label">
78-
<property name="geometry">
79-
<rect>
80-
<x>20</x>
81-
<y>90</y>
82-
<width>220</width>
83-
<height>21</height>
84-
</rect>
85-
</property>
86-
<property name="styleSheet">
87-
<string notr="true">font-weight:bold;</string>
88-
</property>
89-
<property name="text">
90-
<string>Advanced options</string>
91-
</property>
92-
</widget>
93-
<widget class="QCheckBox" name="disable_privkeys_checkbox">
94-
<property name="enabled">
95-
<bool>true</bool>
96-
</property>
97-
<property name="geometry">
98-
<rect>
99-
<x>20</x>
100-
<y>115</y>
101-
<width>220</width>
102-
<height>22</height>
103-
</rect>
104-
</property>
105-
<property name="toolTip">
106-
<string>Disable private keys for this wallet. Wallets with private keys disabled will have no private keys and cannot have an HD seed or imported private keys. This is ideal for watch-only wallets.</string>
107-
</property>
108-
<property name="text">
109-
<string>Disable Private Keys</string>
110-
</property>
111-
</widget>
112-
<widget class="QCheckBox" name="blank_wallet_checkbox">
113-
<property name="geometry">
114-
<rect>
115-
<x>20</x>
116-
<y>135</y>
117-
<width>220</width>
118-
<height>22</height>
119-
</rect>
120-
</property>
121-
<property name="toolTip">
122-
<string>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</string>
123-
</property>
124-
<property name="text">
125-
<string>Make Blank Wallet</string>
126-
</property>
127-
</widget>
128-
<widget class="QCheckBox" name="descriptor_checkbox">
129-
<property name="geometry">
130-
<rect>
131-
<x>20</x>
132-
<y>155</y>
133-
<width>220</width>
134-
<height>22</height>
135-
</rect>
136-
</property>
137-
<property name="toolTip">
138-
<string>Use descriptors for scriptPubKey management</string>
139-
</property>
140-
<property name="text">
141-
<string>Descriptor Wallet</string>
142-
</property>
143-
</widget>
16+
<property name="sizeGripEnabled">
17+
<bool>true</bool>
18+
</property>
19+
<layout class="QVBoxLayout" name="verticalLayout">
20+
<item>
21+
<layout class="QHBoxLayout" name="horizontalLayout">
22+
<item>
23+
<widget class="QLabel" name="wallet_name_label">
24+
<property name="text">
25+
<string>Wallet Name</string>
26+
</property>
27+
</widget>
28+
</item>
29+
<item>
30+
<widget class="QLineEdit" name="wallet_name_line_edit">
31+
<property name="minimumSize">
32+
<size>
33+
<width>262</width>
34+
<height>0</height>
35+
</size>
36+
</property>
37+
<property name="placeholderText">
38+
<string>Wallet</string>
39+
</property>
40+
</widget>
41+
</item>
42+
</layout>
43+
</item>
44+
<item>
45+
<widget class="QCheckBox" name="encrypt_wallet_checkbox">
46+
<property name="toolTip">
47+
<string>Encrypt the wallet. The wallet will be encrypted with a passphrase of your choice.</string>
48+
</property>
49+
<property name="text">
50+
<string>Encrypt Wallet</string>
51+
</property>
52+
<property name="checked">
53+
<bool>false</bool>
54+
</property>
55+
</widget>
56+
</item>
57+
<item>
58+
<spacer name="verticalSpacer_1">
59+
<property name="orientation">
60+
<enum>Qt::Vertical</enum>
61+
</property>
62+
<property name="sizeType">
63+
<enum>QSizePolicy::Fixed</enum>
64+
</property>
65+
<property name="sizeHint" stdset="0">
66+
<size>
67+
<width>20</width>
68+
<height>8</height>
69+
</size>
70+
</property>
71+
</spacer>
72+
</item>
73+
<item>
74+
<widget class="QGroupBox" name="groupBox">
75+
<property name="title">
76+
<string>Advanced Options</string>
77+
</property>
78+
<layout class="QVBoxLayout" name="verticalLayout_groupbox">
79+
<item>
80+
<widget class="QCheckBox" name="disable_privkeys_checkbox">
81+
<property name="enabled">
82+
<bool>true</bool>
83+
</property>
84+
<property name="toolTip">
85+
<string>Disable private keys for this wallet. Wallets with private keys disabled will have no private keys and cannot have an HD seed or imported private keys. This is ideal for watch-only wallets.</string>
86+
</property>
87+
<property name="text">
88+
<string>Disable Private Keys</string>
89+
</property>
90+
</widget>
91+
</item>
92+
<item>
93+
<widget class="QCheckBox" name="blank_wallet_checkbox">
94+
<property name="toolTip">
95+
<string>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</string>
96+
</property>
97+
<property name="text">
98+
<string>Make Blank Wallet</string>
99+
</property>
100+
</widget>
101+
</item>
102+
<item>
103+
<widget class="QCheckBox" name="descriptor_checkbox">
104+
<property name="toolTip">
105+
<string>Use descriptors for scriptPubKey management</string>
106+
</property>
107+
<property name="text">
108+
<string>Descriptor Wallet</string>
109+
</property>
110+
</widget>
111+
</item>
112+
</layout>
113+
</widget>
114+
</item>
115+
<item>
116+
<spacer name="verticalSpacer_2">
117+
<property name="orientation">
118+
<enum>Qt::Vertical</enum>
119+
</property>
120+
<property name="sizeHint" stdset="0">
121+
<size>
122+
<width>20</width>
123+
<height>0</height>
124+
</size>
125+
</property>
126+
</spacer>
127+
</item>
128+
<item>
129+
<widget class="QDialogButtonBox" name="buttonBox">
130+
<property name="orientation">
131+
<enum>Qt::Horizontal</enum>
132+
</property>
133+
<property name="standardButtons">
134+
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
135+
</property>
136+
</widget>
137+
</item>
138+
</layout>
144139
</widget>
145140
<tabstops>
146141
<tabstop>wallet_name_line_edit</tabstop>

0 commit comments

Comments
 (0)