Skip to content

Commit

Permalink
Merge bitcoin-core/gui#293: Enable wordWrap for Services
Browse files Browse the repository at this point in the history
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
  • Loading branch information
hebasto authored and pravblockc committed Nov 18, 2021
1 parent e488115 commit c135639
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions src/qt/forms/debugwindow.ui
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/qt/guiutil.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1752,7 +1752,7 @@ QString formatServicesStr(quint64 mask)
}

if (strList.size())
return strList.join(" & ");
return strList.join(", ");
else
return QObject::tr("None");
}
Expand Down

0 comments on commit c135639

Please sign in to comment.