Skip to content

Commit 4bc3b16

Browse files
committed
Merge bitcoin-core#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
2 parents b49fe0a + a0f7978 commit 4bc3b16

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
@@ -1204,6 +1204,9 @@
12041204
<property name="textFormat">
12051205
<enum>Qt::PlainText</enum>
12061206
</property>
1207+
<property name="wordWrap">
1208+
<bool>true</bool>
1209+
</property>
12071210
<property name="textInteractionFlags">
12081211
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
12091212
</property>

src/qt/guiutil.cpp

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

710710
if (strList.size())
711-
return strList.join(" & ");
711+
return strList.join(", ");
712712
else
713713
return QObject::tr("None");
714714
}

0 commit comments

Comments
 (0)