Skip to content

Commit 4410b61

Browse files
hebastogades
authored andcommitted
Merge bitcoin-core/gui#293: Enable wordWrap for Services
a0f7978 qt: enable wordWrap for peers-tab detail services (randymcmillan) Pull request description: Enable wordWrap for peers-tab detailView Services ACKs for top commit: Talkless: tACK a0f7978 on same environment as previously. hebasto: ACK a0f7978, tested on Linux Mint 20.1 (Qt 5.12.8): kristapsk: re-ACK a0f7978. Tested under Gentoo Linux with Xfce4 (Qt 5.15.2). Tree-SHA512: 872e511d2ecfa72fea0fd3284a958b45ee8aee138469ce7f9cd853cd9098b9583917909934b0a5c96f9b81ea1567bcea6a037558829bb79f2a3f413a83df06e6
1 parent 58d4139 commit 4410b61

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

src/qt/forms/debugwindow.ui

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1033,6 +1033,9 @@
10331033
<property name="textFormat">
10341034
<enum>Qt::PlainText</enum>
10351035
</property>
1036+
<property name="wordWrap">
1037+
<bool>true</bool>
1038+
</property>
10361039
<property name="textInteractionFlags">
10371040
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
10381041
</property>

src/qt/guiutil.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1860,7 +1860,7 @@ QString formatServicesStr(quint64 mask)
18601860
}
18611861

18621862
if (strList.size())
1863-
return strList.join(" & ");
1863+
return strList.join(", ");
18641864
else
18651865
return QObject::tr("None");
18661866
}

0 commit comments

Comments
 (0)