From 197923c54b02d2beba93eb586126a0256c7d2196 Mon Sep 17 00:00:00 2001 From: GRiker Date: Fri, 12 Mar 2010 07:52:15 -0700 Subject: [PATCH] GwR add PDF pagecount to annotations --- src/calibre/devices/kindle/driver.py | 11 +++++------ src/calibre/gui2/ui.py | 5 +++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/calibre/devices/kindle/driver.py b/src/calibre/devices/kindle/driver.py index 4f78b2f98e..2653a3c461 100644 --- a/src/calibre/devices/kindle/driver.py +++ b/src/calibre/devices/kindle/driver.py @@ -448,12 +448,11 @@ class Bookmark(): except: pass elif self.bookmark_extension == 'pdr': - # Book length not yet implemented for PDF files - # After 0.6.45: - # from calibre import plugins - # self.book_length = plugins['pdfreflow'][0].get_numpages(open(book_fs).read()) - - self.book_length = 0 + from calibre import plugins + try: + self.book_length = plugins['pdfreflow'][0].get_numpages(open(book_fs).read()) + except: + pass else: print "unsupported bookmark_extension: %s" % self.bookmark_extension diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py index 8db2a52a3c..4602f117fb 100644 --- a/src/calibre/gui2/ui.py +++ b/src/calibre/gui2/ui.py @@ -1013,9 +1013,10 @@ class Main(MainWindow, Ui_MainWindow, DeviceGUI): spanTag = Tag(ka_soup, 'span') spanTag['style'] = 'font-weight:bold' if bookmark.book_format == 'pdf': - spanTag.insert(0,NavigableString("%s
Last Page Read: %d" % \ + spanTag.insert(0,NavigableString("%s
Last Page Read: %d (%d%%)" % \ (strftime(u'%x', timestamp.timetuple()), - last_read_location))) + last_read_location, + percent_read))) else: spanTag.insert(0,NavigableString("%s
Last Page Read: Location %d (%d%%)" % \ (strftime(u'%x', timestamp.timetuple()),