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

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 identify(log, abort, # {{{
if msprefs['txt_comments']: if msprefs['txt_comments']:
for r in results: 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) r.comments = html2text(r.comments)
max_tags = msprefs['max_tags'] max_tags = msprefs['max_tags']

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

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