GlyphDBEdit: display glyph texts with proper font, according to glyph_font_family and glyph_font_size config variables.

This commit is contained in:
Andrey Golovizin 2014-09-19 23:32:41 +02:00
parent 45ef8dc691
commit 458ef0e6f4
2 changed files with 8 additions and 0 deletions

View file

@ -19,6 +19,8 @@ from confire import Configuration as BaseConfiguration
class Configuration(BaseConfiguration): class Configuration(BaseConfiguration):
allow_bold_italic = True allow_bold_italic = True
glyph_font_family = None
glyph_font_size = None
min_body_height = 10 min_body_height = 10
min_word_distance = 15 min_word_distance = 15

View file

@ -58,12 +58,18 @@ class Column(object):
class TextColumn(Column): class TextColumn(Column):
def data(self, glyph_data, role): def data(self, glyph_data, role):
config = self.document.config
if role == Qt.DecorationRole: if role == Qt.DecorationRole:
return glyph_data.image.qimage return glyph_data.image.qimage
elif role == Qt.FontRole: elif role == Qt.FontRole:
font = QFont() font = QFont()
font.setBold(glyph_data.bold) font.setBold(glyph_data.bold)
font.setItalic(glyph_data.italic) 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 return font
else: else:
return super().data(glyph_data, role) return super().data(glyph_data, role)