diff --git a/src/calibre/gui2/main.py b/src/calibre/gui2/main.py index a8ad9ef83c..b82b0bd051 100644 --- a/src/calibre/gui2/main.py +++ b/src/calibre/gui2/main.py @@ -1194,16 +1194,23 @@ class Main(MainWindow, Ui_MainWindow, DeviceGUI): previous = self.library_view.currentIndex() rows = [x.row() for x in \ self.library_view.selectionModel().selectedRows()] + num = 0 if bulk or (bulk is None and len(book_ids) > 1): self.__bulk_queue = convert_bulk_ebook(self, self.queue_convert_jobs, self.library_view.model().db, book_ids, out_format=prefs['output_format'], args=(rows, previous, self.book_converted)) + num = len(self.__bulk_queue.book_ids) else: jobs, changed, bad = convert_single_ebook(self, self.library_view.model().db, book_ids, out_format=prefs['output_format']) self.queue_convert_jobs(jobs, changed, bad, rows, previous, self.book_converted) + num = len(jobs) + + if num > 0: + self.status_bar.showMessage(_('Starting conversion of %d book(s)') % + num, 2000) def queue_convert_jobs(self, jobs, changed, bad, rows, previous, converted_func, extra_job_args=[]): diff --git a/src/calibre/gui2/tools.py b/src/calibre/gui2/tools.py index 26a417555a..c976616c95 100644 --- a/src/calibre/gui2/tools.py +++ b/src/calibre/gui2/tools.py @@ -31,7 +31,6 @@ def convert_single_ebook(parent, db, book_ids, auto_conversion=False, out_format total = len(book_ids) if total == 0: return None, None, None - parent.status_bar.showMessage(_('Starting conversion of %d books') % total, 2000) for i, book_id in enumerate(book_ids): temp_files = [] @@ -103,7 +102,6 @@ def convert_bulk_ebook(parent, queue, db, book_ids, out_format=None, args=[]): total = len(book_ids) if total == 0: return None, None, None - parent.status_bar.showMessage(_('Starting conversion of %d books') % total, 2000) d = BulkConfig(parent, db, out_format) if d.exec_() != QDialog.Accepted: diff --git a/src/calibre/translations/calibre.pot b/src/calibre/translations/calibre.pot index 09c03f9b70..67a9a3f2b9 100644 --- a/src/calibre/translations/calibre.pot +++ b/src/calibre/translations/calibre.pot @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: calibre 0.6.14\n" -"POT-Creation-Date: 2009-09-28 17:09+MDT\n" -"PO-Revision-Date: 2009-09-28 17:09+MDT\n" +"POT-Creation-Date: 2009-10-01 14:21+MDT\n" +"PO-Revision-Date: 2009-10-01 14:21+MDT\n" "Last-Translator: Automatically generated\n" "Language-Team: LANGUAGE\n" "MIME-Version: 1.0\n" @@ -2581,7 +2581,7 @@ msgid "RB Output" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76 -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1322 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1329 msgid "Choose the format to view" msgstr "" @@ -4691,7 +4691,7 @@ msgid "Save to disk in a single directory" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/main.py:280 -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1424 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1431 msgid "Save only %s format to disk" msgstr "" @@ -4731,7 +4731,7 @@ msgid "Calibre Library" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/main.py:438 -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1567 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1574 msgid "Choose a location for your ebook library." msgstr "" @@ -4905,158 +4905,162 @@ msgstr "" msgid "Cannot convert" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316 -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1335 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212 +msgid "Starting conversion of %d book(s)" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1342 msgid "No book selected" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316 -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1366 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1373 msgid "Cannot view" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1334 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1341 msgid "Cannot open folder" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1351 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1358 msgid "Multiple Books Selected" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1352 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1359 msgid "You are attempting to open %d books. Opening too many books at once can be slow and have a negative effect on the responsiveness of your computer. Once started the process cannot be stopped until complete. Do you wish to continue?" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1367 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1374 msgid "%s has no available formats." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1408 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1415 msgid "Cannot configure" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1409 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1416 msgid "Cannot configure while there are running jobs." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1452 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1459 msgid "No detailed info available" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1453 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1460 msgid "No detailed information is available for books on the device." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1505 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1512 msgid "Error talking to device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1506 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1513 msgid "There was a temporary error talking to the device. Please unplug and reconnect the device and or reboot." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1529 -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1547 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1536 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1554 msgid "Conversion Error" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1530 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1537 msgid "

Could not convert: %s

It is a DRMed book. You must first remove the DRM using third party tools." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1548 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1555 msgid "Failed" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1576 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1583 msgid "Invalid library location" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1577 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1584 msgid "Could not access %s. Using %s as the library." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1624 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1631 msgid "is the result of the efforts of many volunteers from all over the world. If you find it useful, please consider donating to support its development." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1648 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1655 msgid "There are active jobs. Are you sure you want to quit?" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1651 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1658 msgid "" " is communicating with the device!
\n" " Quitting may cause corruption on the device.
\n" " Are you sure you want to quit?" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1655 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1662 msgid "WARNING: Active jobs" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1706 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1713 msgid "will keep running in the system tray. To close it, choose Quit in the context menu of the system tray." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1725 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1732 msgid "Latest version: %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1733 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1740 msgid "Update available" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1734 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1741 msgid "%s has been updated to version %s. See the new features. Visit the download page?" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1752 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1759 msgid "Use the library located at the specified path." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1754 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1761 msgid "Start minimized to system tray." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1756 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1763 msgid "Log debugging information to console" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1758 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1765 msgid "Do not check for updates" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1806 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1813 msgid "If you are sure it is not running" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1808 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1815 msgid "Cannot Start " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1809 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1816 msgid "%s is already running." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1812 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1819 msgid "may be running in the system tray, in the" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1814 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1821 msgid "upper right region of the screen." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1816 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1823 msgid "lower right region of the screen." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1819 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1826 msgid "try rebooting your computer." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1821 -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1833 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1828 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1840 msgid "try deleting the file" msgstr "" @@ -5242,47 +5246,42 @@ msgstr "" msgid "Publishers" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:34 -#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:106 -msgid "Starting conversion of %d books" -msgstr "" - -#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:64 -#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:184 +#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63 +#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182 msgid "Convert book %d of %d (%s)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:91 -#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:204 +#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:90 +#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:202 msgid "Could not convert some books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:92 -#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:205 +#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:91 +#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:203 msgid "Could not convert %d of %d books, because no suitable source format was found." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:123 +#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:121 msgid "Queueing books for bulk conversion" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:183 +#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:181 msgid "Queueing " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:237 +#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:235 msgid "You must set a username and password for %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:242 +#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:240 msgid "Fetch news from " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:253 +#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:251 msgid "Convert existing" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:254 +#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:252 msgid "The following books have already been converted to %s format. Do you wish to reconvert them?" msgstr "" diff --git a/src/calibre/web/feeds/recipes/recipe_honoluluadvertiser.py b/src/calibre/web/feeds/recipes/recipe_honoluluadvertiser.py index b5912954dc..99a5d674ae 100644 --- a/src/calibre/web/feeds/recipes/recipe_honoluluadvertiser.py +++ b/src/calibre/web/feeds/recipes/recipe_honoluluadvertiser.py @@ -1,55 +1,55 @@ -#!/usr/bin/env python - -__license__ = 'GPL v3' -__copyright__ = '2009, Darko Miletic ' -''' -honoluluadvertiser.com -''' - -from calibre.web.feeds.news import BasicNewsRecipe - -class Honoluluadvertiser(BasicNewsRecipe): - title = 'Honolulu Advertiser' - __author__ = 'Darko Miletic' - description = "Latest national and local Hawaii sports news from The Honolulu Advertiser." - publisher = 'Honolulu Advertiser' - category = 'news, Honolulu, Hawaii' - oldest_article = 2 - language = 'en' - max_articles_per_feed = 100 - no_stylesheets = True - use_embedded_content = False - encoding = 'cp1252' - - conversion_options = { - 'comments' : description - ,'tags' : category - ,'language' : language - ,'publisher' : publisher - } - - keep_only_tags = [dict(name='td')] - - remove_tags = [dict(name=['object','link'])] - remove_attributes = ['style'] - - feeds = [ - (u'Breaking news', u'http://www.honoluluadvertiser.com/apps/pbcs.dll/section?Category=RSS01&MIME=XML' ) - ,(u'Local news', u'http://www.honoluluadvertiser.com/apps/pbcs.dll/section?Category=RSS02&MIME=XML' ) - ,(u'Sports', u'http://www.honoluluadvertiser.com/apps/pbcs.dll/section?Category=RSS03&MIME=XML' ) - ,(u'Island life', u'http://www.honoluluadvertiser.com/apps/pbcs.dll/section?Category=RSS05&MIME=XML' ) - ,(u'Entertainment', u'http://www.honoluluadvertiser.com/apps/pbcs.dll/section?Category=RSS06&MIME=XML' ) - ,(u'Business', u'http://www.honoluluadvertiser.com/apps/pbcs.dll/section?Category=RSS04&MIME=XML' ) - ] - - def preprocess_html(self, soup): - st = soup.find('td') - if st: - st.name = 'div' - return soup - - def print_version(self, url): - ubody, sep, rest = url.rpartition('?source') - root, sep2, article_id = ubody.partition('/article/') - return u'http://www.honoluluadvertiser.com/apps/pbcs.dll/article?AID=/' + article_id + '&template=printart' - +#!/usr/bin/env python + +__license__ = 'GPL v3' +__copyright__ = '2009, Darko Miletic ' +''' +honoluluadvertiser.com +''' + +from calibre.web.feeds.news import BasicNewsRecipe + +class Honoluluadvertiser(BasicNewsRecipe): + title = 'Honolulu Advertiser' + __author__ = 'Darko Miletic' + description = "Latest national and local Hawaii sports news from The Honolulu Advertiser." + publisher = 'Honolulu Advertiser' + category = 'news, Honolulu, Hawaii' + oldest_article = 2 + language = 'en' + max_articles_per_feed = 100 + no_stylesheets = True + use_embedded_content = False + encoding = 'cp1252' + + conversion_options = { + 'comments' : description + ,'tags' : category + ,'language' : language + ,'publisher' : publisher + } + + keep_only_tags = [dict(name='td')] + + remove_tags = [dict(name=['object','link'])] + remove_attributes = ['style'] + + feeds = [ + (u'Breaking news', u'http://www.honoluluadvertiser.com/apps/pbcs.dll/section?Category=RSS01&MIME=XML' ) + ,(u'Local news', u'http://www.honoluluadvertiser.com/apps/pbcs.dll/section?Category=RSS02&MIME=XML' ) + ,(u'Sports', u'http://www.honoluluadvertiser.com/apps/pbcs.dll/section?Category=RSS03&MIME=XML' ) + ,(u'Island life', u'http://www.honoluluadvertiser.com/apps/pbcs.dll/section?Category=RSS05&MIME=XML' ) + ,(u'Entertainment', u'http://www.honoluluadvertiser.com/apps/pbcs.dll/section?Category=RSS06&MIME=XML' ) + ,(u'Business', u'http://www.honoluluadvertiser.com/apps/pbcs.dll/section?Category=RSS04&MIME=XML' ) + ] + + def preprocess_html(self, soup): + st = soup.find('td') + if st: + st.name = 'div' + return soup + + def print_version(self, url): + ubody, sep, rest = url.rpartition('?source') + root, sep2, article_id = ubody.partition('/article/') + return u'http://www.honoluluadvertiser.com/apps/pbcs.dll/article?AID=/' + article_id + '&template=printart' +