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

Fix #1445868 [View menu's recently viewed does not truncate book's title](https://bugs.launchpad.net/calibre/+bug/1445868)

Browse Source
This commit is contained in:
Kovid Goyal 2015-04-19 18:36:10 +05:30
parent c34fffe555
commit aaeddce186
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1213,7 +1213,7 @@ def elided_text(text, font=None, width=300, pos='middle'):
of the string with an ellipsis. Results in a string much closer to the of the string with an ellipsis. Results in a string much closer to the
limit than Qt's elidedText().''' limit than Qt's elidedText().'''
from PyQt5.Qt import QFontMetrics, QApplication from PyQt5.Qt import QFontMetrics, QApplication
fm = QApplication.fontMetrics() if font is None else QFontMetrics(font) fm = QApplication.fontMetrics() if font is None else (font if isinstance(font, QFontMetrics) else QFontMetrics(font))
delta = 4 delta = 4
ellipsis = u'\u2026' ellipsis = u'\u2026'

6
src/calibre/gui2/actions/view.py
View File

@ -12,7 +12,8 @@ from PyQt5.Qt import Qt, QAction, pyqtSignal
from calibre.constants import isosx, iswindows from calibre.constants import isosx, iswindows
from calibre.gui2 import ( from calibre.gui2 import (
error_dialog, Dispatcher, question_dialog, config, open_local_file, info_dialog) error_dialog, Dispatcher, question_dialog, config, open_local_file,
info_dialog, elided_text)
from calibre.gui2.dialogs.choose_format import ChooseFormatDialog from calibre.gui2.dialogs.choose_format import ChooseFormatDialog
from calibre.utils.config import prefs, tweaks from calibre.utils.config import prefs, tweaks
from calibre.ptempfile import PersistentTemporaryFile from calibre.ptempfile import PersistentTemporaryFile
@ -66,8 +67,9 @@ class ViewAction(InterfaceAction):
if history: if history:
self.view_menu.insertAction(self.clear_sep2, self.clear_sep1) self.view_menu.insertAction(self.clear_sep2, self.clear_sep1)
self.history_actions.append(self.clear_sep1) self.history_actions.append(self.clear_sep1)
fm = self.gui.fontMetrics()
for id_, title in history: for id_, title in history:
ac = HistoryAction(id_, title, self.view_menu) ac = HistoryAction(id_, elided_text(title, font=fm, pos='right'), self.view_menu)
self.view_menu.insertAction(self.clear_sep2, ac) self.view_menu.insertAction(self.clear_sep2, ac)
ac.view_historical.connect(self.view_historical) ac.view_historical.connect(self.view_historical)
self.history_actions.append(ac) self.history_actions.append(ac)