Backup_Repos/calibre
1
0
Fork 0
mirror of git://github.com/kovidgoyal/calibre.git synced 2026-04-30 02:43:27 +02:00
Code Issues Projects Releases Wiki Activity

py310: More int->float goodness

Browse source
This commit is contained in:
Kovid Goyal 2022-01-09 12:33:53 +05:30
parent 67ad530492
commit 65923491f1
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
4 changed files with 23 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/calibre/gui2/font_family_chooser.py
View file

@ -5,16 +5,17 @@
__copyright__ = '2012, Kovid Goyal <kovid at kovidgoyal.net>'
__docformat__ = 'restructuredtext en'
import os, shutil
from qt.core import (QFontInfo, QFontMetrics, Qt, QFont, QFontDatabase, QPen,
QStyledItemDelegate, QSize, QStyle, QStringListModel, pyqtSignal,
QDialog, QVBoxLayout, QApplication, QFontComboBox, QPushButton,
QToolButton, QGridLayout, QListView, QWidget, QDialogButtonBox, QIcon,
QHBoxLayout, QLabel, QLineEdit, QSizePolicy, QAbstractItemView)
import os
import shutil
from qt.core import (
QAbstractItemView, QDialog, QDialogButtonBox, QFont, QFontComboBox,
QFontDatabase, QFontInfo, QFontMetrics, QGridLayout, QHBoxLayout, QIcon, QLabel,
QLineEdit, QListView, QPen, QPushButton, QSize, QSizePolicy, QStringListModel,
QStyle, QStyledItemDelegate, Qt, QToolButton, QVBoxLayout, QWidget, pyqtSignal
)
from calibre.constants import config_dir
from calibre.gui2 import choose_files, error_dialog, info_dialog, empty_index
from calibre.gui2 import choose_files, empty_index, error_dialog, info_dialog
def add_fonts(parent):
@ -96,7 +97,7 @@ def sizeHint(self, option, index):
def do_size_hint(self, option, index):
text = index.data(Qt.ItemDataRole.DisplayRole) or ''
font = QFont(option.font)
font.setPointSize(QFontInfo(font).pointSize() * 1.5)
font.setPointSizeF(QFontInfo(font).pointSize() * 1.5)
m = QFontMetrics(font)
return QSize(m.width(text), m.height())
@ -106,13 +107,14 @@ def paint(self, painter, option, index):
try:
self.do_paint(painter, option, index)
except:
pass
import traceback
traceback.print_exc()
painter.restore()
def do_paint(self, painter, option, index):
text = str(index.data(Qt.ItemDataRole.DisplayRole) or '')
font = QFont(option.font)
font.setPointSize(QFontInfo(font).pointSize() * 1.5)
font.setPointSizeF(QFontInfo(font).pointSize() * 1.5)
font2 = QFont(font)
font2.setFamily(text)
@ -121,9 +123,11 @@ def do_paint(self, painter, option, index):
font = font2
r = option.rect
color = option.palette.text()
if option.state & QStyle.StateFlag.State_Selected:
painter.setPen(QPen(option.palette.highlightedText(), 0))
color = option.palette.highlightedText()
painter.setPen(QPen(color, 0))
if (option.direction == Qt.LayoutDirection.RightToLeft):
r.setRight(r.right() - 4)
@ -369,7 +373,8 @@ def show_chooser(self):
def test():
app = QApplication([])
from calibre.gui2 import Application
app = Application([])
app
d = QDialog()
d.setLayout(QVBoxLayout())

4
src/calibre/gui2/tweak_book/diff/view.py
View file

@ -114,12 +114,12 @@ def __init__(self, right=False, parent=None, show_open_in_editor=False):
if ff is None:
ff = default_font_family()
font.setFamily(ff)
font.setPointSize(tprefs['editor_font_size'])
font.setPointSizeF(tprefs['editor_font_size'])
self.setFont(font)
self.calculate_metrics()
self.setTabStopWidth(tprefs['editor_tab_stop_width'] * self.space_width)
font = self.heading_font = QFont(self.font())
font.setPointSize(int(tprefs['editor_font_size'] * 1.5))
font.setPointSizeF(tprefs['editor_font_size'] * 1.5)
font.setBold(True)
theme = get_theme(tprefs['editor_theme'])
pal = self.palette()

4
src/calibre/gui2/tweak_book/editor/text.py
View file

@ -253,9 +253,9 @@ def apply_theme(self, theme):
if ff is None:
ff = default_font_family()
font.setFamily(ff)
font.setPointSize(tprefs['editor_font_size'])
font.setPointSizeF(tprefs['editor_font_size'])
self.tooltip_font = QFont(font)
self.tooltip_font.setPointSize(font.pointSize() - 1)
self.tooltip_font.setPointSizeF(font.pointSizeF() - 1.)
self.setFont(font)
self.highlighter.apply_theme(theme)
w = self.fontMetrics()

2
src/calibre/gui2/tweak_book/live_css.py
View file

@ -424,7 +424,7 @@ def preview_refreshed(self):
def apply_theme(self):
f = self.font()
f.setFamily(tprefs['editor_font_family'] or default_font_family())
f.setPointSize(tprefs['editor_font_size'])
f.setPointSizeF(tprefs['editor_font_size'])
self.setFont(f)
theme = get_theme(tprefs['editor_theme'])
pal = self.palette()