Backup_Repos/calibre
1
0
Fork 0
mirror of git://github.com/kovidgoyal/calibre.git synced 2026-01-27 05:55:15 +01:00
Code Issues Projects Releases Wiki Activity

Merge from trunk

Browse source
This commit is contained in:
Charles Haley 2011-04-23 16:51:50 +01:00
commit ba33aed554
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/calibre/ebooks/metadata/sources/identify.py
View file

@ -412,7 +412,7 @@ def get_results():
if msprefs['txt_comments']:
for r in results:
if r.plugin.has_html_comments and r.comments:
if r.identify_plugin.has_html_comments and r.comments:
r.comments = html2text(r.comments)
max_tags = msprefs['max_tags']

1
src/calibre/gui2/viewer/documentview.py
View file

@ -534,6 +534,7 @@ def __init__(self, *args):
_('&Lookup in dictionary'), self)
self.dictionary_action.setShortcut(Qt.CTRL+Qt.Key_L)
self.dictionary_action.triggered.connect(self.lookup)
self.addAction(self.dictionary_action)
self.goto_location_action = QAction(_('Go to...'), self)
self.goto_location_menu = m = QMenu(self)
self.goto_location_actions = a = {