Skip to content

Commit 3431699

Browse files
jonasschnellijonasschnelli
committed
Merge #17597: qt: Fix height of QR-less ReceiveRequestDialog
73529f0 qt: Rename slot to updateDisplayUnit() (Hennadii Stepanov) 68288ef qt: Overhaul ReceiveRequestDialog (Hennadii Stepanov) Pull request description: If master (89a1f7a) is compiled without QR support, the "Request payment to..." dialog looks ugly: ![Screenshot from 2019-11-25 19-58-59](https://user-images.githubusercontent.com/32963518/69566647-3d9c1c80-0fc0-11ea-8ff6-183cea9372c5.png) With this PR: ![Screenshot from 2019-12-26 00-42-46](https://user-images.githubusercontent.com/32963518/71451226-221c6100-277a-11ea-94ae-c19a5c6256f7.png) ![Screenshot from 2019-12-26 00-44-34](https://user-images.githubusercontent.com/32963518/71451228-29436f00-277a-11ea-8ac5-1bafe6d73b5c.png) ![Screenshot from 2019-12-26 00-48-51](https://user-images.githubusercontent.com/32963518/71451230-2e082300-277a-11ea-8c4c-726ca7b776e7.png) Other minor changes: - "URI" abbreviation is not translated now - wallet name is shown if available ACKs for top commit: jonasschnelli: Tested ACK 73529f0 Tree-SHA512: 45f9a41d3c72978d78eb2e8ca98e274b8be5abf5352fd3e1f4f49514ce744994545fb3012e80600ded936ae41c6be4d4825a0c5f7bcb3db671d69e0299f0f65b
2 parents 5f75c5e + 73529f0 commit 3431699

File tree

4 files changed

+289
-116
lines changed

4 files changed

+289
-116
lines changed

‎src/qt/forms/receiverequestdialog.ui

Lines changed: 223 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -6,68 +6,233 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>487</width>
10-
<height>597</height>
9+
<width>413</width>
10+
<height>229</height>
1111
</rect>
1212
</property>
13-
<layout class="QVBoxLayout" name="verticalLayout_3">
14-
<item>
15-
<widget class="QRImageWidget" name="lblQRCode">
16-
<property name="sizePolicy">
17-
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
18-
<horstretch>0</horstretch>
19-
<verstretch>0</verstretch>
20-
</sizepolicy>
21-
</property>
22-
<property name="minimumSize">
23-
<size>
24-
<width>300</width>
25-
<height>320</height>
26-
</size>
27-
</property>
28-
<property name="toolTip">
29-
<string>QR Code</string>
13+
<property name="windowTitle">
14+
<string>Request payment to ...</string>
15+
</property>
16+
<layout class="QGridLayout" name="gridLayout" columnstretch="0,1">
17+
<property name="sizeConstraint">
18+
<enum>QLayout::SetFixedSize</enum>
19+
</property>
20+
<item row="0" column="0" colspan="2" alignment="Qt::AlignHCenter">
21+
<widget class="QRImageWidget" name="qr_code">
22+
<property name="text">
23+
<string notr="true">QR image</string>
24+
</property>
25+
<property name="textInteractionFlags">
26+
<set>Qt::NoTextInteraction</set>
27+
</property>
28+
</widget>
29+
</item>
30+
<item row="1" column="0" colspan="2">
31+
<widget class="QLabel" name="payment_header">
32+
<property name="font">
33+
<font>
34+
<weight>75</weight>
35+
<bold>true</bold>
36+
</font>
37+
</property>
38+
<property name="text">
39+
<string>Payment information</string>
40+
</property>
41+
<property name="textInteractionFlags">
42+
<set>Qt::NoTextInteraction</set>
43+
</property>
44+
</widget>
45+
</item>
46+
<item row="2" column="0" alignment="Qt::AlignRight|Qt::AlignTop">
47+
<widget class="QLabel" name="uri_tag">
48+
<property name="font">
49+
<font>
50+
<weight>75</weight>
51+
<bold>true</bold>
52+
</font>
53+
</property>
54+
<property name="text">
55+
<string notr="true">URI:</string>
3056
</property>
3157
<property name="textFormat">
3258
<enum>Qt::PlainText</enum>
3359
</property>
34-
<property name="alignment">
35-
<set>Qt::AlignCenter</set>
60+
<property name="textInteractionFlags">
61+
<set>Qt::NoTextInteraction</set>
62+
</property>
63+
</widget>
64+
</item>
65+
<item row="2" column="1" alignment="Qt::AlignTop">
66+
<widget class="QLabel" name="uri_content">
67+
<property name="text">
68+
<string notr="true">bitcoin:BC1...</string>
69+
</property>
70+
<property name="textFormat">
71+
<enum>Qt::RichText</enum>
3672
</property>
3773
<property name="wordWrap">
3874
<bool>true</bool>
3975
</property>
76+
<property name="textInteractionFlags">
77+
<set>Qt::TextSelectableByMouse</set>
78+
</property>
79+
</widget>
80+
</item>
81+
<item row="3" column="0" alignment="Qt::AlignRight|Qt::AlignTop">
82+
<widget class="QLabel" name="address_tag">
83+
<property name="font">
84+
<font>
85+
<weight>75</weight>
86+
<bold>true</bold>
87+
</font>
88+
</property>
89+
<property name="text">
90+
<string>Address:</string>
91+
</property>
92+
<property name="textInteractionFlags">
93+
<set>Qt::NoTextInteraction</set>
94+
</property>
4095
</widget>
4196
</item>
42-
<item>
43-
<widget class="QTextEdit" name="outUri">
44-
<property name="sizePolicy">
45-
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
46-
<horstretch>0</horstretch>
47-
<verstretch>0</verstretch>
48-
</sizepolicy>
49-
</property>
50-
<property name="minimumSize">
51-
<size>
52-
<width>0</width>
53-
<height>50</height>
54-
</size>
55-
</property>
56-
<property name="frameShape">
57-
<enum>QFrame::NoFrame</enum>
58-
</property>
59-
<property name="frameShadow">
60-
<enum>QFrame::Plain</enum>
61-
</property>
62-
<property name="tabChangesFocus">
97+
<item row="3" column="1" alignment="Qt::AlignTop">
98+
<widget class="QLabel" name="address_content">
99+
<property name="text">
100+
<string notr="true">bc1...</string>
101+
</property>
102+
<property name="textFormat">
103+
<enum>Qt::PlainText</enum>
104+
</property>
105+
<property name="textInteractionFlags">
106+
<set>Qt::TextSelectableByMouse</set>
107+
</property>
108+
</widget>
109+
</item>
110+
<item row="4" column="0" alignment="Qt::AlignRight|Qt::AlignTop">
111+
<widget class="QLabel" name="amount_tag">
112+
<property name="font">
113+
<font>
114+
<weight>75</weight>
115+
<bold>true</bold>
116+
</font>
117+
</property>
118+
<property name="text">
119+
<string>Amount:</string>
120+
</property>
121+
<property name="textInteractionFlags">
122+
<set>Qt::NoTextInteraction</set>
123+
</property>
124+
</widget>
125+
</item>
126+
<item row="4" column="1" alignment="Qt::AlignTop">
127+
<widget class="QLabel" name="amount_content">
128+
<property name="text">
129+
<string notr="true">0.00000000 BTC</string>
130+
</property>
131+
<property name="textFormat">
132+
<enum>Qt::PlainText</enum>
133+
</property>
134+
<property name="textInteractionFlags">
135+
<set>Qt::TextSelectableByMouse</set>
136+
</property>
137+
</widget>
138+
</item>
139+
<item row="5" column="0" alignment="Qt::AlignRight|Qt::AlignTop">
140+
<widget class="QLabel" name="label_tag">
141+
<property name="font">
142+
<font>
143+
<weight>75</weight>
144+
<bold>true</bold>
145+
</font>
146+
</property>
147+
<property name="text">
148+
<string>Label:</string>
149+
</property>
150+
<property name="textInteractionFlags">
151+
<set>Qt::NoTextInteraction</set>
152+
</property>
153+
</widget>
154+
</item>
155+
<item row="5" column="1" alignment="Qt::AlignTop">
156+
<widget class="QLabel" name="label_content">
157+
<property name="text">
158+
<string notr="true">label content</string>
159+
</property>
160+
<property name="textFormat">
161+
<enum>Qt::PlainText</enum>
162+
</property>
163+
<property name="wordWrap">
164+
<bool>true</bool>
165+
</property>
166+
<property name="textInteractionFlags">
167+
<set>Qt::TextSelectableByMouse</set>
168+
</property>
169+
</widget>
170+
</item>
171+
<item row="6" column="0" alignment="Qt::AlignRight|Qt::AlignTop">
172+
<widget class="QLabel" name="message_tag">
173+
<property name="font">
174+
<font>
175+
<weight>75</weight>
176+
<bold>true</bold>
177+
</font>
178+
</property>
179+
<property name="text">
180+
<string>Message:</string>
181+
</property>
182+
<property name="textInteractionFlags">
183+
<set>Qt::NoTextInteraction</set>
184+
</property>
185+
</widget>
186+
</item>
187+
<item row="6" column="1" alignment="Qt::AlignTop">
188+
<widget class="QLabel" name="message_content">
189+
<property name="text">
190+
<string notr="true">message content</string>
191+
</property>
192+
<property name="textFormat">
193+
<enum>Qt::PlainText</enum>
194+
</property>
195+
<property name="wordWrap">
196+
<bool>true</bool>
197+
</property>
198+
<property name="textInteractionFlags">
199+
<set>Qt::TextSelectableByMouse</set>
200+
</property>
201+
</widget>
202+
</item>
203+
<item row="7" column="0" alignment="Qt::AlignRight|Qt::AlignTop">
204+
<widget class="QLabel" name="wallet_tag">
205+
<property name="font">
206+
<font>
207+
<weight>75</weight>
208+
<bold>true</bold>
209+
</font>
210+
</property>
211+
<property name="text">
212+
<string>Wallet:</string>
213+
</property>
214+
<property name="textInteractionFlags">
215+
<set>Qt::NoTextInteraction</set>
216+
</property>
217+
</widget>
218+
</item>
219+
<item row="7" column="1" alignment="Qt::AlignTop">
220+
<widget class="QLabel" name="wallet_content">
221+
<property name="text">
222+
<string notr="true">wallet name</string>
223+
</property>
224+
<property name="textFormat">
225+
<enum>Qt::PlainText</enum>
226+
</property>
227+
<property name="wordWrap">
63228
<bool>true</bool>
64229
</property>
65230
<property name="textInteractionFlags">
66-
<set>Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
231+
<set>Qt::TextSelectableByMouse</set>
67232
</property>
68233
</widget>
69234
</item>
70-
<item>
235+
<item row="8" column="0" colspan="2">
71236
<layout class="QHBoxLayout" name="horizontalLayout">
72237
<item>
73238
<widget class="QPushButton" name="btnCopyURI">
@@ -114,8 +279,11 @@
114279
</item>
115280
<item>
116281
<widget class="QDialogButtonBox" name="buttonBox">
282+
<property name="focusPolicy">
283+
<enum>Qt::StrongFocus</enum>
284+
</property>
117285
<property name="standardButtons">
118-
<set>QDialogButtonBox::Close</set>
286+
<set>QDialogButtonBox::Ok</set>
119287
</property>
120288
</widget>
121289
</item>
@@ -130,37 +298,27 @@
130298
<header>qt/qrimagewidget.h</header>
131299
</customwidget>
132300
</customwidgets>
301+
<tabstops>
302+
<tabstop>buttonBox</tabstop>
303+
<tabstop>btnCopyURI</tabstop>
304+
<tabstop>btnCopyAddress</tabstop>
305+
<tabstop>btnSaveAs</tabstop>
306+
</tabstops>
133307
<resources/>
134308
<connections>
135-
<connection>
136-
<sender>buttonBox</sender>
137-
<signal>rejected()</signal>
138-
<receiver>ReceiveRequestDialog</receiver>
139-
<slot>reject()</slot>
140-
<hints>
141-
<hint type="sourcelabel">
142-
<x>452</x>
143-
<y>573</y>
144-
</hint>
145-
<hint type="destinationlabel">
146-
<x>243</x>
147-
<y>298</y>
148-
</hint>
149-
</hints>
150-
</connection>
151309
<connection>
152310
<sender>buttonBox</sender>
153311
<signal>accepted()</signal>
154312
<receiver>ReceiveRequestDialog</receiver>
155313
<slot>accept()</slot>
156314
<hints>
157315
<hint type="sourcelabel">
158-
<x>452</x>
159-
<y>573</y>
316+
<x>135</x>
317+
<y>230</y>
160318
</hint>
161319
<hint type="destinationlabel">
162-
<x>243</x>
163-
<y>298</y>
320+
<x>135</x>
321+
<y>126</y>
164322
</hint>
165323
</hints>
166324
</connection>

0 commit comments

Comments
 (0)