From 9805f3a6441e9801c4d979296bdede097d0974f0 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 27 Jun 2019 12:05:49 +0530 Subject: [PATCH] DRYer --- src/calibre/gui2/book_details.py | 14 +++----------- src/calibre/gui2/metadata/single_download.py | 13 +++---------- src/calibre/gui2/widgets2.py | 9 ++++++++- 3 files changed, 14 insertions(+), 22 deletions(-) diff --git a/src/calibre/gui2/book_details.py b/src/calibre/gui2/book_details.py index 16a032d4e5..71c124b2a6 100644 --- a/src/calibre/gui2/book_details.py +++ b/src/calibre/gui2/book_details.py @@ -8,7 +8,7 @@ from collections import namedtuple from functools import partial from PyQt5.Qt import ( - QAction, QApplication, QColor, QEasingCurve, QFontInfo, QIcon, QLayout, QMenu, + QAction, QApplication, QColor, QEasingCurve, QIcon, QLayout, QMenu, QMimeData, QPainter, QPalette, QPen, QPixmap, QPropertyAnimation, QRect, QSize, QSizePolicy, Qt, QUrl, QWidget, pyqtProperty, pyqtSignal ) @@ -118,12 +118,6 @@ def render_html(mi, css, vertical, widget, all_fields=False, render_data_func=No ans = unicode_type(col.name()) return ans - fi = QFontInfo(QApplication.font(widget)) - f = fi.pixelSize() + 1 + int(tweaks['change_book_details_font_size_by']) - fam = unicode_type(fi.family()).strip().replace('"', '') - if not fam: - fam = 'sans-serif' - c = color_to_string(QApplication.palette().color(QPalette.Normal, QPalette.WindowText)) templ = '''\ @@ -132,8 +126,6 @@ def render_html(mi, css, vertical, widget, all_fields=False, render_data_func=No @@ -145,10 +137,10 @@ def render_html(mi, css, vertical, widget, all_fields=False, render_data_func=No %%s - '''%(f, fam, c, css) + '''%(c, css) comments = '' if comment_fields: - comments = '\n'.join(u'
%s
' % x for x in comment_fields) + comments = '\n'.join('
%s
' % x for x in comment_fields) right_pane = '
%s
'%comments if vertical: diff --git a/src/calibre/gui2/metadata/single_download.py b/src/calibre/gui2/metadata/single_download.py index e07d726cf6..3adde555b0 100644 --- a/src/calibre/gui2/metadata/single_download.py +++ b/src/calibre/gui2/metadata/single_download.py @@ -17,7 +17,7 @@ from io import BytesIO from PyQt5.Qt import ( QStyledItemDelegate, QTextDocument, QRectF, QIcon, Qt, QApplication, QDialog, QVBoxLayout, QLabel, QDialogButtonBox, QStyle, QStackedWidget, - QWidget, QTableView, QGridLayout, QFontInfo, QPalette, QTimer, pyqtSignal, + QWidget, QTableView, QGridLayout, QPalette, QTimer, pyqtSignal, QAbstractTableModel, QSize, QListView, QPixmap, QModelIndex, QAbstractListModel, QRect, QTextBrowser, QStringListModel, QMenu, QCursor, QHBoxLayout, QPushButton, QSizePolicy) @@ -35,7 +35,6 @@ from calibre.utils.date import (utcnow, fromordinal, format_date, UNDEFINED_DATE, as_utc) from calibre.library.comments import comments_to_html from calibre import force_unicode -from calibre.utils.config import tweaks from calibre.utils.ipc.simple_worker import fork_job, WorkerError from calibre.ptempfile import TemporaryDirectory from polyglot.builtins import iteritems, itervalues, unicode_type, range, getcwd @@ -355,19 +354,13 @@ class Comments(HTMLDisplay): # {{{ ans = unicode_type(col.name()) return ans - fi = QFontInfo(QApplication.font(self.parent())) - f = fi.pixelSize()+1+int(tweaks['change_book_details_font_size_by']) - fam = unicode_type(fi.family()).strip().replace('"', '') - if not fam: - fam = 'sans-serif' - c = color_to_string(QApplication.palette().color(QPalette.Normal, QPalette.WindowText)) templ = '''\