Changes for pyside:
customwidgets in ui-files and QtGui.QPen instantiation
This commit is contained in:
parent
8dca39e902
commit
58466d5424
|
@ -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()
|
||||||
|
|
|
@ -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>
|
||||||
|
|
|
@ -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>
|
||||||
|
|
|
@ -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()
|
||||||
|
|
Reference in New Issue
Block a user