mirror of
git://github.com/kovidgoyal/calibre.git
synced 2026-01-04 12:06:00 +01:00
pyqt6: Fix QPrinter::pageSize no longer present in pyqt6
This commit is contained in:
parent
106b9657a1
commit
f4eec76a09
1 changed files with 2 additions and 2 deletions
|
|
@ -10,7 +10,7 @@
|
|||
QCursor, QColor, QWidget, QPixmap, QSplitterHandle, QToolButton,
|
||||
Qt, pyqtSignal, QSize, QSplitter, QPainter, QPageSize, QPrinter,
|
||||
QLineEdit, QComboBox, QPen, QGraphicsScene, QMenu, QStringListModel, QKeySequence,
|
||||
QCompleter, QTimer, QRect, QGraphicsView, QPagedPaintDevice, QPalette, QClipboard)
|
||||
QCompleter, QTimer, QRect, QGraphicsView, QPalette, QClipboard)
|
||||
|
||||
from calibre.constants import iswindows, ismacos
|
||||
from calibre.gui2 import (error_dialog, pixmap_to_data, gprefs,
|
||||
|
|
@ -1268,7 +1268,7 @@ def initialize(self, choices=None):
|
|||
if iswindows or ismacos:
|
||||
# On Linux, this can cause Qt to load the system cups plugin
|
||||
# which can crash: https://bugs.launchpad.net/calibre/+bug/1861741
|
||||
PaperSizes.system_default_paper_size = 'letter' if QPrinter().pageSize() == QPagedPaintDevice.PageSize.Letter else 'a4'
|
||||
PaperSizes.system_default_paper_size = 'letter' if QPrinter().pageLayout().pageSize().id() == QPageSize.PageSizeId.Letter else 'a4'
|
||||
if not choices:
|
||||
from calibre.ebooks.conversion.plugins.pdf_output import PAPER_SIZES
|
||||
choices = PAPER_SIZES
|
||||
|
|
|
|||
Loading…
Reference in a new issue