Merge branch 'v0.6' into qt5-wip #2237

Open
kashikoibumi wants to merge 38 commits from kashikoibumi/qt5-wip into v0.6
Showing only changes of commit 66c22ed9b9 - Show all commits

View File

@ -145,7 +145,7 @@ class NetworkStatus(QtWidgets.QWidget, RetranslateMixin):
0, 0, QtWidgets.QTableWidgetItem( 0, 0, QtWidgets.QTableWidgetItem(
"%s:%i" % (destination.host, destination.port))) "%s:%i" % (destination.host, destination.port)))
self.tableWidgetConnectionCount.setItem( self.tableWidgetConnectionCount.setItem(
0, 2, QtWidgets.QTableWidgetItem("%s" % (c.userAgent))) 0, 2, QtWidgets.QTableWidgetItem("%s" % (c.userAgent.decode("utf-8", "replace"))))
self.tableWidgetConnectionCount.setItem( self.tableWidgetConnectionCount.setItem(
0, 3, QtWidgets.QTableWidgetItem("%s" % (c.tlsVersion))) 0, 3, QtWidgets.QTableWidgetItem("%s" % (c.tlsVersion)))
self.tableWidgetConnectionCount.setItem( self.tableWidgetConnectionCount.setItem(