diff options
| author | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2021-05-11 00:42:48 +0300 |
|---|---|---|
| committer | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2021-05-11 00:45:15 +0300 |
| commit | 4bc3b16349848100e6a127c71a3a2fe7e1e57c2d (patch) | |
| tree | 53d4e58f5db60e86330c1593d4ebbdcfa3fa5070 /src | |
| parent | b49fe0a75aef589a014ea229ccf1b4797583eaa3 (diff) | |
| parent | a0f797867433b0d3e8d7851ddf05743fe70d320a (diff) | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/qt/forms/debugwindow.ui | 3 | ||||
| -rw-r--r-- | src/qt/guiutil.cpp | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/qt/forms/debugwindow.ui b/src/qt/forms/debugwindow.ui index 61ecea1cac..7a25ba907e 100644 --- a/src/qt/forms/debugwindow.ui +++ b/src/qt/forms/debugwindow.ui @@ -1204,6 +1204,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> diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp index d10bf9f9ae..998d38e10d 100644 --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -708,7 +708,7 @@ QString formatServicesStr(quint64 mask) } if (strList.size()) - return strList.join(" & "); + return strList.join(", "); else return QObject::tr("None"); } |