Merge bitcoin-core/gui#293: Enable wordWrap for Services

a0f797867433b0d3e8d7851ddf05743fe70d320a 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 a0f797867433b0d3e8d7851ddf05743fe70d320a on same environment as previously.
  hebasto:
    ACK a0f797867433b0d3e8d7851ddf05743fe70d320a, tested on Linux Mint 20.1 (Qt 5.12.8):
  kristapsk:
    re-ACK a0f797867433b0d3e8d7851ddf05743fe70d320a. Tested under Gentoo Linux with Xfce4 (Qt 5.15.2).

Tree-SHA512: 872e511d2ecfa72fea0fd3284a958b45ee8aee138469ce7f9cd853cd9098b9583917909934b0a5c96f9b81ea1567bcea6a037558829bb79f2a3f413a83df06e6
This commit is contained in:
Hennadii Stepanov 2021-05-11 00:42:48 +03:00 committed by pasta
parent def4afe732
commit 1e39067b3d
2 changed files with 4 additions and 1 deletions

View File

@ -1062,6 +1062,9 @@
<property name="textFormat">
<enum>Qt::PlainText</enum>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property>

View File

@ -1752,7 +1752,7 @@ QString formatServicesStr(quint64 mask)
}
if (strList.size())
return strList.join(" & ");
return strList.join(", ");
else
return QObject::tr("None");
}