Merge bitcoin-core/gui#293: Enable wordWrap for Services
a0f7978674qt: enable wordWrap for peers-tab detail services (randymcmillan) Pull request description: Enable wordWrap for peers-tab detailView Services ACKs for top commit: Talkless: tACKa0f7978674on same environment as previously. hebasto: ACKa0f7978674, tested on Linux Mint 20.1 (Qt 5.12.8): kristapsk: re-ACKa0f7978674. Tested under Gentoo Linux with Xfce4 (Qt 5.15.2). Tree-SHA512: 872e511d2ecfa72fea0fd3284a958b45ee8aee138469ce7f9cd853cd9098b9583917909934b0a5c96f9b81ea1567bcea6a037558829bb79f2a3f413a83df06e6
This commit is contained in:
2 files changed
+4
-1
No files matched your search
@@ -1204,6 +1204,9 @@
|
|||||||
<property name="textFormat">
|
<property name="textFormat">
|
||||||
<enum>Qt::PlainText</enum>
|
<enum>Qt::PlainText</enum>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="wordWrap">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
<property name="textInteractionFlags">
|
<property name="textInteractionFlags">
|
||||||
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
|
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
|
||||||
</property>
|
</property>
|
||||||
|
|||||||
+1
-1
@@ -708,7 +708,7 @@ QString formatServicesStr(quint64 mask)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (strList.size())
|
if (strList.size())
|
||||||
return strList.join(" & ");
|
return strList.join(", ");
|
||||||
else
|
else
|
||||||
return QObject::tr("None");
|
return QObject::tr("None");
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user