Skip to content

Commit 5c99323

Browse files
laanwjlaanwj
committed
Merge pull request #3693
f05fa03 [Qt] small .ui cleanup for optionsdialog and coincontrol (Philip Kaufmann)
2 parents bd8e375 + f05fa03 commit 5c99323

File tree

2 files changed

+80
-83
lines changed

2 files changed

+80
-83
lines changed

‎src/qt/forms/coincontroldialog.ui

Lines changed: 71 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -346,83 +346,77 @@
346346
<property name="frameShadow">
347347
<enum>QFrame::Sunken</enum>
348348
</property>
349-
<widget class="QWidget" name="horizontalLayoutWidget">
350-
<property name="geometry">
351-
<rect>
352-
<x>10</x>
353-
<y>0</y>
354-
<width>781</width>
355-
<height>41</height>
356-
</rect>
357-
</property>
358-
<layout class="QHBoxLayout" name="horizontalLayoutPanel" stretch="0,0,0,0,0">
359-
<property name="spacing">
360-
<number>14</number>
361-
</property>
362-
<item>
363-
<widget class="QPushButton" name="pushButtonSelectAll">
364-
<property name="sizePolicy">
365-
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
366-
<horstretch>0</horstretch>
367-
<verstretch>0</verstretch>
368-
</sizepolicy>
369-
</property>
370-
<property name="text">
371-
<string>(un)select all</string>
372-
</property>
373-
</widget>
374-
</item>
375-
<item>
376-
<widget class="QRadioButton" name="radioTreeMode">
377-
<property name="sizePolicy">
378-
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
379-
<horstretch>0</horstretch>
380-
<verstretch>0</verstretch>
381-
</sizepolicy>
382-
</property>
383-
<property name="text">
384-
<string>Tree mode</string>
385-
</property>
386-
<property name="checked">
387-
<bool>true</bool>
388-
</property>
389-
</widget>
390-
</item>
391-
<item>
392-
<widget class="QRadioButton" name="radioListMode">
393-
<property name="sizePolicy">
394-
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
395-
<horstretch>0</horstretch>
396-
<verstretch>0</verstretch>
397-
</sizepolicy>
398-
</property>
399-
<property name="text">
400-
<string>List mode</string>
401-
</property>
402-
</widget>
403-
</item>
404-
<item>
405-
<widget class="QLabel" name="labelLocked">
406-
<property name="text">
407-
<string notr="true">(1 locked)</string>
408-
</property>
409-
</widget>
410-
</item>
411-
<item>
412-
<spacer name="horizontalSpacer">
413-
<property name="orientation">
414-
<enum>Qt::Horizontal</enum>
415-
</property>
416-
<property name="sizeHint" stdset="0">
417-
<size>
418-
<width>40</width>
419-
<height>20</height>
420-
</size>
421-
</property>
422-
</spacer>
423-
</item>
424-
</layout>
425-
</widget>
349+
<layout class="QHBoxLayout" name="horizontalLayout">
350+
<item>
351+
<layout class="QHBoxLayout" name="horizontalLayoutPanel" stretch="0,0,0,0,0">
352+
<property name="spacing">
353+
<number>14</number>
354+
</property>
355+
<item>
356+
<widget class="QPushButton" name="pushButtonSelectAll">
357+
<property name="sizePolicy">
358+
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
359+
<horstretch>0</horstretch>
360+
<verstretch>0</verstretch>
361+
</sizepolicy>
362+
</property>
363+
<property name="text">
364+
<string>(un)select all</string>
365+
</property>
366+
</widget>
367+
</item>
368+
<item>
369+
<widget class="QRadioButton" name="radioTreeMode">
370+
<property name="sizePolicy">
371+
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
372+
<horstretch>0</horstretch>
373+
<verstretch>0</verstretch>
374+
</sizepolicy>
375+
</property>
376+
<property name="text">
377+
<string>Tree mode</string>
378+
</property>
379+
<property name="checked">
380+
<bool>true</bool>
381+
</property>
382+
</widget>
383+
</item>
384+
<item>
385+
<widget class="QRadioButton" name="radioListMode">
386+
<property name="sizePolicy">
387+
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
388+
<horstretch>0</horstretch>
389+
<verstretch>0</verstretch>
390+
</sizepolicy>
391+
</property>
392+
<property name="text">
393+
<string>List mode</string>
394+
</property>
395+
</widget>
396+
</item>
397+
<item>
398+
<widget class="QLabel" name="labelLocked">
399+
<property name="text">
400+
<string notr="true">(1 locked)</string>
401+
</property>
402+
</widget>
403+
</item>
404+
<item>
405+
<spacer name="horizontalSpacer">
406+
<property name="orientation">
407+
<enum>Qt::Horizontal</enum>
408+
</property>
409+
<property name="sizeHint" stdset="0">
410+
<size>
411+
<width>40</width>
412+
<height>20</height>
413+
</size>
414+
</property>
415+
</spacer>
416+
</item>
417+
</layout>
418+
</item>
419+
</layout>
426420
</widget>
427421
</item>
428422
<item>

‎src/qt/forms/optionsdialog.ui

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@
142142
<attribute name="title">
143143
<string>W&amp;allet</string>
144144
</attribute>
145-
<layout class="QVBoxLayout" name="verticalLayout_Network">
145+
<layout class="QVBoxLayout" name="verticalLayout_Wallet">
146146
<item>
147147
<widget class="QLabel" name="transactionFeeInfoLabel">
148148
<property name="text">
@@ -157,7 +157,7 @@
157157
</widget>
158158
</item>
159159
<item>
160-
<layout class="QHBoxLayout" name="horizontalLayout_1_Main">
160+
<layout class="QHBoxLayout" name="horizontalLayout_1_Wallet">
161161
<item>
162162
<widget class="QLabel" name="transactionFeeLabel">
163163
<property name="text">
@@ -175,7 +175,7 @@
175175
<widget class="BitcoinAmountField" name="transactionFee"/>
176176
</item>
177177
<item>
178-
<spacer name="horizontalSpacer_1_Main">
178+
<spacer name="horizontalSpacer_1_Wallet">
179179
<property name="orientation">
180180
<enum>Qt::Horizontal</enum>
181181
</property>
@@ -190,10 +190,13 @@
190190
</layout>
191191
</item>
192192
<item>
193-
<widget class="QLabel" name="label">
193+
<widget class="QLabel" name="spendZeroConfChangeInfoLabel">
194194
<property name="text">
195195
<string>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</string>
196196
</property>
197+
<property name="textFormat">
198+
<enum>Qt::PlainText</enum>
199+
</property>
197200
<property name="wordWrap">
198201
<bool>true</bool>
199202
</property>
@@ -202,12 +205,12 @@
202205
<item>
203206
<widget class="QCheckBox" name="spendZeroConfChange">
204207
<property name="text">
205-
<string>Spend unconfirmed change (experts only)</string>
208+
<string>&amp;Spend unconfirmed change (experts only)</string>
206209
</property>
207210
</widget>
208211
</item>
209212
<item>
210-
<spacer name="verticalSpacer">
213+
<spacer name="verticalSpacer_Wallet">
211214
<property name="orientation">
212215
<enum>Qt::Vertical</enum>
213216
</property>

0 commit comments

Comments
 (0)