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-05-07 17:08:26 +01:00
commit beb548a88a
2 changed files with 6 additions and 5 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

@ -403,7 +403,7 @@ def identify(log, abort, # {{{
result.identify_plugin = plugin result.identify_plugin = plugin
if msprefs['txt_comments']: if msprefs['txt_comments']:
if plugin.has_html_comments and result.comments: if plugin.has_html_comments and result.comments:
result.comments = html2text(r.comments) result.comments = html2text(result.comments)
log('The identify phase took %.2f seconds'%(time.time() - start_time)) log('The identify phase took %.2f seconds'%(time.time() - start_time))
log('The longest time (%f) was taken by:'%longest, lp) log('The longest time (%f) was taken by:'%longest, lp)

9
src/calibre/gui2/metadata/basic_widgets.py
View File

@ -1038,10 +1038,11 @@ class IdentifiersEdit(QLineEdit): # {{{
self.setStyleSheet('QLineEdit { background-color: %s }'%col) self.setStyleSheet('QLineEdit { background-color: %s }'%col)
def paste_isbn(self): def paste_isbn(self):
cb = QApplication.clipboard() text = unicode(QApplication.clipboard().text()).strip()
vals = self.current_val if text:
vals['isbn'] = cb.text() vals = self.current_val
self.current_val = vals vals['isbn'] = text
self.current_val = vals
# }}} # }}}