v31.1-roots.1 · Commit 6: [PATCH 06/17] feat(wallet): preserve Roots signing and spend controls on v31
src/qt/forms/coincontroldialog.ui
Before: src/qt/forms/coincontroldialog.ui · After: src/qt/forms/coincontroldialog.ui
File metadata
index f053adba0f0cc6e83101302d62c9dacaed9bc997..4abe45dfad138ec2851036b2bd0bbe12ebfab5c4 100644
Download original patch · Release notes
Diff rows 1–171 of 171. Line numbers refer to the original before/after files.
+ Added− RemovedUnmarked lines are context.
Scroll the code area horizontally to read long lines. The two line-number columns refer to before and after.
src/qt/forms/coincontroldialog.ui
CHANGED
|
@@ -15,14 +15,14 @@
|
|
|
15
15
|
</property>
|
|
16
16
|
<layout class="QVBoxLayout" name="verticalLayout">
|
|
17
17
|
<item>
|
|
18
|
-
<layout class="QHBoxLayout" name="horizontalLayoutTop" stretch="0,0,0,0">
|
|
18
|
+
<layout class="QGridLayout" name="horizontalLayoutTop">
|
|
19
19
|
<property name="topMargin">
|
|
20
20
|
<number>0</number>
|
|
21
21
|
</property>
|
|
22
22
|
<property name="bottomMargin">
|
|
23
23
|
<number>10</number>
|
|
24
24
|
</property>
|
|
25
|
-
<item>
|
|
25
|
+
<item row="0" column="0">
|
|
26
26
|
<layout class="QFormLayout" name="formLayoutCoinControl1">
|
|
27
27
|
<property name="labelAlignment">
|
|
28
28
|
<set>Qt::AlignLeft|Qt::AlignVCenter</set>
|
|
@@ -77,7 +77,7 @@
|
|
|
77
77
|
</font>
|
|
78
78
|
</property>
|
|
79
79
|
<property name="text">
|
|
80
|
-
<string>Bytes:</string>
|
|
80
|
+
<string>Estimated vbytes:</string>
|
|
81
81
|
</property>
|
|
82
82
|
</widget>
|
|
83
83
|
</item>
|
|
@@ -99,7 +99,7 @@
|
|
|
99
99
|
</item>
|
|
100
100
|
</layout>
|
|
101
101
|
</item>
|
|
102
|
-
<item>
|
|
102
|
+
<item row="0" column="1">
|
|
103
103
|
<layout class="QFormLayout" name="formLayoutCoinControl2">
|
|
104
104
|
<property name="horizontalSpacing">
|
|
105
105
|
<number>10</number>
|
|
@@ -144,7 +144,7 @@
|
|
|
144
144
|
</item>
|
|
145
145
|
</layout>
|
|
146
146
|
</item>
|
|
147
|
-
<item>
|
|
147
|
+
<item row="0" column="2">
|
|
148
148
|
<layout class="QFormLayout" name="formLayoutCoinControl3">
|
|
149
149
|
<property name="horizontalSpacing">
|
|
150
150
|
<number>10</number>
|
|
@@ -189,7 +189,7 @@
|
|
|
189
189
|
</item>
|
|
190
190
|
</layout>
|
|
191
191
|
</item>
|
|
192
|
-
<item>
|
|
192
|
+
<item row="1" column="0">
|
|
193
193
|
<layout class="QFormLayout" name="formLayoutCoinControl4">
|
|
194
194
|
<property name="labelAlignment">
|
|
195
195
|
<set>Qt::AlignLeft|Qt::AlignVCenter</set>
|
|
@@ -272,6 +272,15 @@
|
|
|
272
272
|
</item>
|
|
273
273
|
</layout>
|
|
274
274
|
</item>
|
|
275
|
+
<item row="1" column="1" colspan="2">
|
|
276
|
+
<layout class="QFormLayout" name="formLayoutCoinControlSummary">
|
|
277
|
+
<item row="0" column="0"><widget class="QLabel" name="labelCoinControlFeeRateText"><property name="text"><string>Fee rate:</string></property></widget></item>
|
|
278
|
+
<item row="0" column="1"><widget class="QLabel" name="labelCoinControlFeeRate"><property name="text"><string notr="true">—</string></property></widget></item>
|
|
279
|
+
<item row="1" column="0"><widget class="QLabel" name="labelCoinControlRbfText"><property name="text"><string>RBF:</string></property></widget></item>
|
|
280
|
+
<item row="1" column="1"><widget class="QLabel" name="labelCoinControlRbf">
|
|
281
|
+
<property name="wordWrap"><bool>true</bool></property><property name="text"><string>Does not signal Replace-By-Fee</string></property></widget></item>
|
|
282
|
+
</layout>
|
|
283
|
+
</item>
|
|
275
284
|
</layout>
|
|
276
285
|
</item>
|
|
277
286
|
<item>
|
|
@@ -290,11 +299,17 @@
|
|
|
290
299
|
</property>
|
|
291
300
|
<layout class="QHBoxLayout" name="horizontalLayout">
|
|
292
301
|
<item>
|
|
293
|
-
<layout class="QHBoxLayout" name="horizontalLayoutPanel" stretch="0,0,0,0,0">
|
|
302
|
+
<layout class="QGridLayout" name="horizontalLayoutPanel">
|
|
294
303
|
<property name="spacing">
|
|
295
304
|
<number>14</number>
|
|
296
305
|
</property>
|
|
297
|
-
<item>
|
|
306
|
+
<item row="0" column="0" colspan="2">
|
|
307
|
+
<widget class="QLineEdit" name="lineEditFilter">
|
|
308
|
+
<property name="placeholderText"><string>Filter inputs…</string></property>
|
|
309
|
+
<property name="clearButtonEnabled"><bool>true</bool></property>
|
|
310
|
+
</widget>
|
|
311
|
+
</item>
|
|
312
|
+
<item row="0" column="2">
|
|
298
313
|
<widget class="QPushButton" name="pushButtonSelectAll">
|
|
299
314
|
<property name="sizePolicy">
|
|
300
315
|
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
|
|
@@ -310,7 +325,7 @@
|
|
|
310
325
|
</property>
|
|
311
326
|
</widget>
|
|
312
327
|
</item>
|
|
313
|
-
<item>
|
|
328
|
+
<item row="0" column="3">
|
|
314
329
|
<widget class="QRadioButton" name="radioTreeMode">
|
|
315
330
|
<property name="sizePolicy">
|
|
316
331
|
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
|
|
@@ -323,7 +338,7 @@
|
|
|
323
338
|
</property>
|
|
324
339
|
</widget>
|
|
325
340
|
</item>
|
|
326
|
-
<item>
|
|
341
|
+
<item row="0" column="4">
|
|
327
342
|
<widget class="QRadioButton" name="radioListMode">
|
|
328
343
|
<property name="sizePolicy">
|
|
329
344
|
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
|
|
@@ -339,14 +354,34 @@
|
|
|
339
354
|
</property>
|
|
340
355
|
</widget>
|
|
341
356
|
</item>
|
|
342
|
-
<item>
|
|
357
|
+
<item row="0" column="5">
|
|
343
358
|
<widget class="QLabel" name="labelLocked">
|
|
344
359
|
<property name="text">
|
|
345
360
|
<string notr="true">(1 locked)</string>
|
|
346
361
|
</property>
|
|
347
362
|
</widget>
|
|
348
363
|
</item>
|
|
349
|
-
<item>
|
|
364
|
+
<item row="1" column="0" colspan="3">
|
|
365
|
+
<widget class="QLabel" name="labelAvailable">
|
|
366
|
+
<property name="wordWrap"><bool>true</bool></property>
|
|
367
|
+
<property name="text"><string>Available: 0 (0 eligible)</string></property>
|
|
368
|
+
</widget>
|
|
369
|
+
</item>
|
|
370
|
+
<item row="1" column="3" colspan="3">
|
|
371
|
+
<widget class="QLabel" name="labelCoinControlDust">
|
|
372
|
+
<property name="wordWrap"><bool>true</bool></property>
|
|
373
|
+
<property name="text"><string>No dust change detected</string></property>
|
|
374
|
+
<property name="toolTip"><string>This is an estimate; the final transaction preview is authoritative.</string></property>
|
|
375
|
+
</widget>
|
|
376
|
+
</item>
|
|
377
|
+
<item row="2" column="0" colspan="6">
|
|
378
|
+
<widget class="QLabel" name="labelSelectionNotice">
|
|
379
|
+
<property name="visible"><bool>false</bool></property>
|
|
380
|
+
<property name="wordWrap"><bool>true</bool></property>
|
|
381
|
+
<property name="text"><string>Input selection is current.</string></property>
|
|
382
|
+
</widget>
|
|
383
|
+
</item>
|
|
384
|
+
<item row="0" column="6">
|
|
350
385
|
<spacer name="horizontalSpacer">
|
|
351
386
|
<property name="orientation">
|
|
352
387
|
<enum>Qt::Horizontal</enum>
|
|
@@ -373,7 +408,7 @@
|
|
|
373
408
|
<bool>false</bool>
|
|
374
409
|
</property>
|
|
375
410
|
<property name="columnCount">
|
|
376
|
-
<number>6</number>
|
|
411
|
+
<number>9</number>
|
|
377
412
|
</property>
|
|
378
413
|
<attribute name="headerShowSortIndicator" stdset="0">
|
|
379
414
|
<bool>true</bool>
|
|
@@ -414,26 +449,9 @@
|
|
|
414
449
|
<string>Confirmed</string>
|
|
415
450
|
</property>
|
|
416
451
|
</column>
|
|
417
|
-
<column>
|
|
418
|
-
<property name="text">
|
|
419
|
-
<string/>
|
|
420
|
-
</property>
|
|
421
|
-
</column>
|
|
422
|
-
<column>
|
|
423
|
-
<property name="text">
|
|
424
|
-
<string/>
|
|
425
|
-
</property>
|
|
426
|
-
</column>
|
|
427
|
-
<column>
|
|
428
|
-
<property name="text">
|
|
429
|
-
<string/>
|
|
430
|
-
</property>
|
|
431
|
-
</column>
|
|
432
|
-
<column>
|
|
433
|
-
<property name="text">
|
|
434
|
-
<string/>
|
|
435
|
-
</property>
|
|
436
|
-
</column>
|
|
452
|
+
<column><property name="text"><string>Status</string></property><property name="toolTip"><string>Wallet-reported facts, not a privacy score.</string></property></column>
|
|
453
|
+
<column><property name="text"><string>Effective value</string></property><property name="toolTip"><string>Value after the wallet's estimated input fee where available.</string></property></column>
|
|
454
|
+
<column><property name="text"><string>Input bytes</string></property><property name="toolTip"><string>Wallet-provided input size estimate.</string></property></column>
|
|
437
455
|
</widget>
|
|
438
456
|
</item>
|
|
439
457
|
<item>
|