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

apoelstra · apoelstra · commit 8d570c2dcbae · 2021-07-08T23:02:50.000Z
diff --git 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
@@ -776,7 +776,7 @@ QString formatServicesStr(quint64 mask)
     }
 
     if (strList.size())
-        return strList.join(" & ");
+        return strList.join(", ");
     else
         return QObject::tr("None");
 }

Original file line number	Diff line number	Diff line change
`@@ -776,7 +776,7 @@ QString formatServicesStr(quint64 mask)`
`776`	`776`	`}`
`777`	`777`
`778`	`778`	`if (strList.size())`
`779`		`- return strList.join(" & ");`
	`779`	`+ return strList.join(", ");`
`780`	`780`	`else`
`781`	`781`	`return QObject::tr("None");`
`782`	`782`	`}`