From 458ef0e6f4a2a45eca98fd32a3a92eea243b463a Mon Sep 17 00:00:00 2001 From: Andrey Golovizin Date: Fri, 19 Sep 2014 23:32:41 +0200 Subject: [PATCH] GlyphDBEdit: display glyph texts with proper font, according to glyph_font_family and glyph_font_size config variables. --- pixelocr/config.py | 2 ++ pixelocr/gui/glyphdbedit.py | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/pixelocr/config.py b/pixelocr/config.py index 0388195..43e173c 100644 --- a/pixelocr/config.py +++ b/pixelocr/config.py @@ -19,6 +19,8 @@ from confire import Configuration as BaseConfiguration class Configuration(BaseConfiguration): allow_bold_italic = True + glyph_font_family = None + glyph_font_size = None min_body_height = 10 min_word_distance = 15 diff --git a/pixelocr/gui/glyphdbedit.py b/pixelocr/gui/glyphdbedit.py index a91a94c..abe6324 100644 --- a/pixelocr/gui/glyphdbedit.py +++ b/pixelocr/gui/glyphdbedit.py @@ -58,12 +58,18 @@ class Column(object): class TextColumn(Column): def data(self, glyph_data, role): + config = self.document.config + if role == Qt.DecorationRole: return glyph_data.image.qimage elif role == Qt.FontRole: font = QFont() font.setBold(glyph_data.bold) font.setItalic(glyph_data.italic) + if config.glyph_font_family: + font.setFamily(config.glyph_font_family) + if config.glyph_font_size: + font.setPixelSize(config.glyph_font_size) return font else: return super().data(glyph_data, role)