Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Allow the use of condensed/expanded fonts as interface fonts

Browse Source
This commit is contained in:
Kovid Goyal 2011-05-12 15:05:55 -06:00
parent e19edba3ef
commit 953c8e9395
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calibre/gui2/__init__.py
View File

@ -620,7 +620,11 @@ class Application(QApplication):
self.original_font = QFont(QApplication.font()) self.original_font = QFont(QApplication.font())
fi = gprefs['font'] fi = gprefs['font']
if fi is not None: if fi is not None:
QApplication.setFont(QFont(*fi)) font = QFont(*(fi[:4]))
s = gprefs.get('font_stretch', None)
if s is not None:
font.setStretch(s)
QApplication.setFont(font)
def _send_file_open_events(self): def _send_file_open_events(self):
with self._file_open_lock: with self._file_open_lock:

18
src/calibre/gui2/preferences/look_feel.py
View File

@ -161,7 +161,11 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
def initialize(self): def initialize(self):
ConfigWidgetBase.initialize(self) ConfigWidgetBase.initialize(self)
self.current_font = self.initial_font = gprefs['font'] font = gprefs['font']
if font is not None:
font = list(font)
font.append(gprefs.get('font_stretch', QFont.Unstretched))
self.current_font = self.initial_font = font
self.update_font_display() self.update_font_display()
self.display_model.initialize() self.display_model.initialize()
@ -178,7 +182,8 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
def build_font_obj(self): def build_font_obj(self):
font_info = self.current_font font_info = self.current_font
if font_info is not None: if font_info is not None:
font = QFont(*font_info) font = QFont(*(font_info[:4]))
font.setStretch(font_info[4])
else: else:
font = qt_app.original_font font = qt_app.original_font
return font return font
@ -215,15 +220,18 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
if fd.exec_() == fd.Accepted: if fd.exec_() == fd.Accepted:
font = fd.selectedFont() font = fd.selectedFont()
fi = QFontInfo(font) fi = QFontInfo(font)
self.current_font = (unicode(fi.family()), fi.pointSize(), self.current_font = [unicode(fi.family()), fi.pointSize(),
fi.weight(), fi.italic()) fi.weight(), fi.italic(), font.stretch()]
self.update_font_display() self.update_font_display()
self.changed_signal.emit() self.changed_signal.emit()
def commit(self, *args): def commit(self, *args):
rr = ConfigWidgetBase.commit(self, *args) rr = ConfigWidgetBase.commit(self, *args)
if self.current_font != self.initial_font: if self.current_font != self.initial_font:
gprefs['font'] = self.current_font gprefs['font'] = (self.current_font[:4] if self.current_font else
None)
gprefs['font_stretch'] = (self.current_font[4] if self.current_font
is not None else QFont.Unstretched)
QApplication.setFont(self.font_display.font()) QApplication.setFont(self.font_display.font())
rr = True rr = True
self.display_model.commit() self.display_model.commit()