Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use a dedicated widget for rendering the icon in message boxes rather than a QLabel. Maybe that will fix the problem of mis-rendered icons on OS X?

Browse Source
This commit is contained in:
Kovid Goyal 2016-11-02 17:54:03 +05:30
parent 3e30513da6
commit 06cf81afbf
1 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/calibre/gui2/dialogs/message_box.py
View File

@ -7,14 +7,37 @@ __docformat__ = 'restructuredtext en'
import sys import sys
from PyQt5.Qt import (QDialog, QIcon, QApplication, QSize, QKeySequence, from PyQt5.Qt import (
QPainter, QDialog, QIcon, QApplication, QSize, QKeySequence,
QAction, Qt, QTextBrowser, QDialogButtonBox, QVBoxLayout, QGridLayout, QAction, Qt, QTextBrowser, QDialogButtonBox, QVBoxLayout, QGridLayout,
QLabel, QPlainTextEdit, QTextDocument, QCheckBox, pyqtSignal) QLabel, QPlainTextEdit, QTextDocument, QCheckBox, pyqtSignal, QWidget,
QSizePolicy)
from calibre.constants import __version__, isfrozen from calibre.constants import __version__, isfrozen
from calibre.gui2 import gprefs from calibre.gui2 import gprefs
class Icon(QWidget):
def __init__(self, parent=None):
QWidget.__init__(self, parent)
self.pixmap = None
self.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
def set_icon(self, qicon):
self.pixmap = qicon.pixmap(64, 64)
def sizeHint(self):
return QSize(64, 64)
def paintEvent(self, ev):
if self.pixmap is not None:
x = (self.width() - 64) // 2
y = (self.height() - 64) // 2
p = QPainter(self)
p.drawPixmap(x, y, self.width(), self.height(), self.pixmap)
class MessageBox(QDialog): # {{{ class MessageBox(QDialog): # {{{
ERROR = 0 ERROR = 0
@ -29,11 +52,8 @@ class MessageBox(QDialog): # {{{
self.resize(497, 235) self.resize(497, 235)
self.gridLayout = l = QGridLayout(self) self.gridLayout = l = QGridLayout(self)
l.setObjectName("gridLayout") l.setObjectName("gridLayout")
self.icon_label = la = QLabel('') self.icon_widget = Icon(self)
la.setMaximumSize(QSize(64, 64)) l.addWidget(self.icon_widget)
la.setScaledContents(True)
la.setObjectName("icon_label")
l.addWidget(la)
self.msg = la = QLabel(self) self.msg = la = QLabel(self)
la.setWordWrap(True), la.setMinimumWidth(400) la.setWordWrap(True), la.setMinimumWidth(400)
la.setOpenExternalLinks(True) la.setOpenExternalLinks(True)
@ -75,7 +95,7 @@ class MessageBox(QDialog): # {{{
self.setWindowTitle(title) self.setWindowTitle(title)
self.setWindowIcon(self.icon) self.setWindowIcon(self.icon)
self.icon_label.setPixmap(self.icon.pixmap(64, 64)) self.icon_widget.set_icon(self.icon)
self.msg.setText(msg) self.msg.setText(msg)
self.det_msg.setPlainText(det_msg) self.det_msg.setPlainText(det_msg)
self.det_msg.setVisible(False) self.det_msg.setVisible(False)
@ -339,9 +359,8 @@ class JobError(QDialog): # {{{
self.setLayout(l) self.setLayout(l)
self.icon = QIcon(I('dialog_error.png')) self.icon = QIcon(I('dialog_error.png'))
self.setWindowIcon(self.icon) self.setWindowIcon(self.icon)
self.icon_label = QLabel() self.icon_widget = Icon(self)
self.icon_label.setPixmap(self.icon.pixmap(68, 68)) self.icon_widget.set_icon(self.icon)
self.icon_label.setMaximumSize(QSize(68, 68))
self.msg_label = QLabel('<p>&nbsp;') self.msg_label = QLabel('<p>&nbsp;')
self.msg_label.setStyleSheet('QLabel { margin-top: 1ex; }') self.msg_label.setStyleSheet('QLabel { margin-top: 1ex; }')
self.msg_label.setWordWrap(True) self.msg_label.setWordWrap(True)
@ -366,7 +385,7 @@ class JobError(QDialog): # {{{
_('Show detailed information about this error')) _('Show detailed information about this error'))
self.suppress = QCheckBox(self) self.suppress = QCheckBox(self)
l.addWidget(self.icon_label, 0, 0, 1, 1) l.addWidget(self.icon_widget, 0, 0, 1, 1)
l.addWidget(self.msg_label, 0, 1, 1, 1) l.addWidget(self.msg_label, 0, 1, 1, 1)
l.addWidget(self.det_msg, 1, 0, 1, 2) l.addWidget(self.det_msg, 1, 0, 1, 2)
l.addWidget(self.suppress, 2, 0, 1, 2, Qt.AlignLeft|Qt.AlignBottom) l.addWidget(self.suppress, 2, 0, 1, 2, Qt.AlignLeft|Qt.AlignBottom)