Bitmessage/PyBitmessage-2024-12-19
Archived
2
0
Fork 0
Code Issues 168 Pull Requests 52 Actions Packages Projects Releases 5 Wiki Activity

Runnable with both Python3 and Python2, with both PyQt5 and PyQt4 by using Qt.py #2250

Open
kashikoibumi wants to merge 127 commits from kashikoibumi/py3qt into v0.6
pull from: kashikoibumi/py3qt
merge into: Bitmessage:v0.6
Conversation 2 Commits 127 Files Changed 179 +6 -7
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 58466d5424 - Show all commits

4
src/bitmessageqt/__init__.py
View File

@ -1781,11 +1781,9 @@ class MyForm(settingsmixin.SMainWindow):
fontMetrics = QtGui.QFontMetrics(font) fontMetrics = QtGui.QFontMetrics(font)
rect = fontMetrics.boundingRect(txt) rect = fontMetrics.boundingRect(txt)
# draw text # draw text
# painter = QtGui.QPainter(self)
painter = QtGui.QPainter() painter = QtGui.QPainter()
painter.begin(pixmap) painter.begin(pixmap)
painter.setPen( painter.setPen(QtGui.QPen(QtGui.QColor(255, 0, 0)))
QtGui.QPen(QtGui.QColor(255, 0, 0), QtCore.Qt.SolidPattern))
painter.setFont(font) painter.setFont(font)
painter.drawText(24-rect.right()-marginX, -rect.top()+marginY, txt) painter.drawText(24-rect.right()-marginX, -rect.top()+marginY, txt)
painter.end() painter.end()

2
src/bitmessageqt/blacklist.ui
View File

@ -98,7 +98,7 @@
<customwidget> <customwidget>
<class>STableWidget</class> <class>STableWidget</class>
<extends>QTableWidget</extends> <extends>QTableWidget</extends>
<header>bitmessageqt/settingsmixin.h</header> <header>bitmessageqt.settingsmixin</header>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<resources> <resources>

2
src/bitmessageqt/networkstatus.ui
View File

@ -296,7 +296,7 @@
<customwidget> <customwidget>
<class>STableWidget</class> <class>STableWidget</class>
<extends>QTableWidget</extends> <extends>QTableWidget</extends>
<header>bitmessageqt/settingsmixin.h</header> <header>bitmessageqt.settingsmixin</header>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<resources> <resources>

5
src/qidenticon.py
View File

@ -129,11 +129,12 @@ class IdenticonRendererBase(object):
QtCore.QPointF(size, size), QtCore.QPointF(0., size)] QtCore.QPointF(size, size), QtCore.QPointF(0., size)]
rotation = [0, 90, 180, 270] rotation = [0, 90, 180, 270]
nopen = QtGui.QPen(foreColor, QtCore.Qt.NoPen) nopen = QtGui.QPen(foreColor)
nopen.setStyle(QtCore.Qt.NoPen)
foreBrush = QtGui.QBrush(foreColor, QtCore.Qt.SolidPattern) foreBrush = QtGui.QBrush(foreColor, QtCore.Qt.SolidPattern)
if penwidth > 0: if penwidth > 0:
pen_color = QtGui.QColor(255, 255, 255) pen_color = QtGui.QColor(255, 255, 255)
pen = QtGui.QPen(pen_color, QtCore.Qt.SolidPattern) pen = QtGui.QPen(pen_color)
pen.setWidth(penwidth) pen.setWidth(penwidth)
painter = QtGui.QPainter() painter = QtGui.QPainter()