GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-14 12:43:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge 4bc3b16349 into merged_master (Bitcoin PR bitcoin-core/gui#293)

Browse source
This commit is contained in:
Andrew Poelstra 2021-07-08 23:02:50 +00:00
commit 8d570c2dcb
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/qt/forms/debugwindow.ui
View file

@ -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>

2
src/qt/guiutil.cpp
View file

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