From b04eed00121f98fee1316cc3bff761e4f993c438 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Fri, 27 May 2011 13:00:31 +0100 Subject: [PATCH 01/47] New store: EBookShoppeUKStore. small correction to FoylesUKStore. fix to threading problem in search causing range errors. Disable waterstones. --- src/calibre/customize/builtins.py | 13 ++- .../gui2/store/ebookshoppe_uk_plugin.py | 97 +++++++++++++++++++ src/calibre/gui2/store/foyles_uk_plugin.py | 9 +- src/calibre/gui2/store/search/models.py | 2 + 4 files changed, 118 insertions(+), 3 deletions(-) create mode 100644 src/calibre/gui2/store/ebookshoppe_uk_plugin.py diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py index 4a970b4661..150ad269bb 100644 --- a/src/calibre/customize/builtins.py +++ b/src/calibre/customize/builtins.py @@ -1393,6 +1393,16 @@ class StoreWoblinkStore(StoreBase): headquarters = 'PL' formats = ['EPUB'] +class StoreEBookShoppeUKStore(StoreBase): + name = 'ebookShoppe UK' + author = u'Charles Haley' + description = u'We made this website in an attempt to offer the widest range of UK eBooks possible across and as many formats as we could manage.' + actual_plugin = 'calibre.gui2.store.ebookshoppe_uk_plugin:EBookShoppeUKStore' + + drm_free_only = False + headquarters = 'UK' + formats = ['EPUB', 'PDF'] + plugins += [ StoreArchiveOrgStore, StoreAmazonKindleStore, @@ -1404,6 +1414,7 @@ plugins += [ StoreBeWriteStore, StoreDieselEbooksStore, StoreEbookscomStore, + StoreEBookShoppeUKStore, StoreEPubBuyDEStore, StoreEHarlequinStore, StoreFeedbooksStore, @@ -1421,7 +1432,7 @@ plugins += [ StorePragmaticBookshelfStore, StoreSmashwordsStore, StoreVirtualoStore, - StoreWaterstonesUKStore, + # StoreWaterstonesUKStore, StoreWeightlessBooksStore, StoreWizardsTowerBooksStore, StoreWoblinkStore diff --git a/src/calibre/gui2/store/ebookshoppe_uk_plugin.py b/src/calibre/gui2/store/ebookshoppe_uk_plugin.py new file mode 100644 index 0000000000..de5304da86 --- /dev/null +++ b/src/calibre/gui2/store/ebookshoppe_uk_plugin.py @@ -0,0 +1,97 @@ +# -*- coding: utf-8 -*- + +from __future__ import (unicode_literals, division, absolute_import, print_function) + +__license__ = 'GPL 3' +__copyright__ = '2011, John Schember ' +__docformat__ = 'restructuredtext en' + +import urllib2 +from contextlib import closing + +from lxml import html + +from PyQt4.Qt import QUrl + +from calibre import browser, url_slash_cleaner +from calibre.gui2 import open_url +from calibre.gui2.store import StorePlugin +from calibre.gui2.store.basic_config import BasicStoreConfig +from calibre.gui2.store.search_result import SearchResult +from calibre.gui2.store.web_store_dialog import WebStoreDialog + +class EBookShoppeUKStore(BasicStoreConfig, StorePlugin): + + def open(self, parent=None, detail_item=None, external=False): + url_details = 'http://www.awin1.com/cread.php?awinmid=1414&awinaffid=120917&clickref=&p={0}' + url = 'http://www.awin1.com/awclick.php?mid=2666&id=120917' + + if external or self.config.get('open_external', False): + if detail_item: + url = url_details.format(detail_item) + open_url(QUrl(url)) + else: + detail_url = None + if detail_item: + detail_url = url_details.format(detail_item) + d = WebStoreDialog(self.gui, url, parent, detail_url) + d.setWindowTitle(self.name) + d.set_tags(self.config.get('tags', '')) + d.exec_() + + # reduce max_results because the filter will match everything. See the + # setting of 'author' below for more details + + def search(self, query, max_results=5, timeout=60): + url = 'http://www.ebookshoppe.com/search.php?search_query=' + urllib2.quote(query) + br = browser() + + counter = max_results + with closing(br.open(url, timeout=timeout)) as f: + doc = html.fromstring(f.read()) + for data in doc.xpath('//ul[@class="ProductList"]/li'): + if counter <= 0: + break + + id = ''.join(data.xpath('./div[@class="ProductDetails"]/' + 'strong/a/@href')).strip() + if not id: + continue + cover_url = ''.join(data.xpath('./div[@class="ProductImage"]/a/img/@src')) + title = ''.join(data.xpath('./div[@class="ProductDetails"]/strong/a/text()')) + price = ''.join(data.xpath('./div[@class="ProductPriceRating"]/em/text()')) + counter -= 1 + + s = SearchResult() + s.cover_url = cover_url + s.title = title.strip() + # Set the author to the query terms to ensure that author + # queries match something when pruning searches. Of course, this + # means that all books will match. Sigh... + s.author = query + s.price = price + s.drm = SearchResult.DRM_UNLOCKED + s.detail_item = id + s.formats = '' + + # Call this here instead of later. Reason: painting then + # removing matches looks very strange. There are also issues + # with threading. Yes, this makes things take longer, but we + # will do the work anyway. + self.my_get_details(s, timeout) + + yield s + + def my_get_details(self, search_result, timeout): + br = browser() + with closing(br.open(search_result.detail_item, timeout=timeout)) as nf: + idata = html.fromstring(nf.read()) + author = ''.join(idata.xpath('//div[@id="ProductOtherDetails"]/dl/dd[1]/text()')) + if author: + search_result.author = author + formats = idata.xpath('//dl[@class="ProductAddToCart"]/dd/' + 'ul[@class="ProductOptionList"]/li/label/text()') + if formats: + search_result.formats = ', '.join(formats) + search_result.drm = SearchResult.DRM_UNKNOWN + return True \ No newline at end of file diff --git a/src/calibre/gui2/store/foyles_uk_plugin.py b/src/calibre/gui2/store/foyles_uk_plugin.py index 1a997cd671..fd670d2d85 100644 --- a/src/calibre/gui2/store/foyles_uk_plugin.py +++ b/src/calibre/gui2/store/foyles_uk_plugin.py @@ -23,12 +23,13 @@ from calibre.gui2.store.web_store_dialog import WebStoreDialog class FoylesUKStore(BasicStoreConfig, StorePlugin): def open(self, parent=None, detail_item=None, external=False): - url = 'http://www.awin1.com/cread.php?awinmid=1414&awinaffid=120917&clickref=&p=' + url = 'http://www.awin1.com/awclick.php?mid=1414&id=120917' + detail_url = 'http://www.awin1.com/cread.php?awinmid=1414&awinaffid=120917&clickref=&p=' url_redirect = 'http://www.foyles.co.uk' if external or self.config.get('open_external', False): if detail_item: - url = url + url_redirect + detail_item + url = detail_url + url_redirect + detail_item open_url(QUrl(url_slash_cleaner(url))) else: detail_url = None @@ -54,6 +55,10 @@ class FoylesUKStore(BasicStoreConfig, StorePlugin): if not id: continue + # filter out the audio books + if not data.xpath('boolean(.//div[@class="Relative"]/ul/li[contains(text(), "ePub")])'): + continue + cover_url = ''.join(data.xpath('.//a[@class="Jacket"]/img/@src')) if cover_url: cover_url = 'http://www.foyles.co.uk' + cover_url diff --git a/src/calibre/gui2/store/search/models.py b/src/calibre/gui2/store/search/models.py index d7941480cc..64724be6aa 100644 --- a/src/calibre/gui2/store/search/models.py +++ b/src/calibre/gui2/store/search/models.py @@ -150,6 +150,8 @@ class Matches(QAbstractItemModel): def data(self, index, role): row, col = index.row(), index.column() + if row >= len(self.matches): + return NONE result = self.matches[row] if role == Qt.DisplayRole: if col == 1: From 82021c246f0cce3130874803c3200821f88c664c Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 27 May 2011 12:58:37 -0600 Subject: [PATCH 02/47] Fix #789247 (Calibre has a problem with my locale) --- src/calibre/utils/localization.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/calibre/utils/localization.py b/src/calibre/utils/localization.py index 533fd03457..92e6ea9b5e 100644 --- a/src/calibre/utils/localization.py +++ b/src/calibre/utils/localization.py @@ -29,8 +29,11 @@ def get_lang(): lang = os.environ.get('CALIBRE_OVERRIDE_LANG', lang) if lang is not None: return lang - lang = locale.getdefaultlocale(['LANGUAGE', 'LC_ALL', 'LC_CTYPE', + try: + lang = locale.getdefaultlocale(['LANGUAGE', 'LC_ALL', 'LC_CTYPE', 'LC_MESSAGES', 'LANG'])[0] + except: + pass # This happens on Ubuntu apparently if lang is None and os.environ.has_key('LANG'): # Needed for OS X try: lang = os.environ['LANG'] From c6cf6337589ebc557fe9e2fe941feac514b96c09 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 27 May 2011 16:56:30 -0600 Subject: [PATCH 03/47] After adding books always select the most recently added book. Fixes #789343 (mismatch between cover browser and main list) --- src/calibre/gui2/actions/add.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/gui2/actions/add.py b/src/calibre/gui2/actions/add.py index 737bf38a56..3556f1db80 100644 --- a/src/calibre/gui2/actions/add.py +++ b/src/calibre/gui2/actions/add.py @@ -317,6 +317,7 @@ class AddAction(InterfaceAction): _('Uploading books to device.'), 2000) if getattr(self._adder, 'number_of_books_added', 0) > 0: self.gui.library_view.model().books_added(self._adder.number_of_books_added) + self.gui.library_view.set_current_row(0) if hasattr(self.gui, 'db_images'): self.gui.db_images.reset() self.gui.tags_view.recount() @@ -338,7 +339,6 @@ class AddAction(InterfaceAction): self.gui.library_view.model().current_changed(current_idx, current_idx) - if getattr(self._adder, 'critical', None): det_msg = [] for name, log in self._adder.critical.items(): From ca6e74f762c73e8d69a1f0d931172388108059c7 Mon Sep 17 00:00:00 2001 From: John Schember Date: Fri, 27 May 2011 20:07:48 -0400 Subject: [PATCH 04/47] Store: Fix threading issue. Fix Manybooks cover download. --- src/calibre/gui2/store/manybooks_plugin.py | 3 ++- src/calibre/gui2/store/search/models.py | 11 +++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/calibre/gui2/store/manybooks_plugin.py b/src/calibre/gui2/store/manybooks_plugin.py index 1ae9d47d01..e990accc86 100644 --- a/src/calibre/gui2/store/manybooks_plugin.py +++ b/src/calibre/gui2/store/manybooks_plugin.py @@ -78,7 +78,8 @@ class ManyBooksStore(BasicStoreConfig, StorePlugin): cover_name = mo.group() cover_name = cover_name.replace('etext', '') cover_id = id.split('.')[0] - cover_url = 'http://manybooks_images.s3.amazonaws.com/original_covers/' + id[0] + '/' + cover_name + '/' + cover_id + '-thumb.jpg' + cover_url = 'http://www.manybooks.net/images/' + id[0] + '/' + cover_name + '/' + cover_id + '-thumb.jpg' + print(cover_url) counter -= 1 diff --git a/src/calibre/gui2/store/search/models.py b/src/calibre/gui2/store/search/models.py index d7941480cc..3d1a5c2724 100644 --- a/src/calibre/gui2/store/search/models.py +++ b/src/calibre/gui2/store/search/models.py @@ -12,7 +12,7 @@ from operator import attrgetter from PyQt4.Qt import (Qt, QAbstractItemModel, QVariant, QPixmap, QModelIndex, QSize, pyqtSignal) -from calibre.gui2 import NONE +from calibre.gui2 import NONE, FunctionDispatcher from calibre.gui2.store.search_result import SearchResult from calibre.gui2.store.search.download_thread import DetailsThreadPool, \ CoverThreadPool @@ -56,6 +56,9 @@ class Matches(QAbstractItemModel): self.search_filter = SearchFilter() self.cover_pool = CoverThreadPool(cover_thread_count) self.details_pool = DetailsThreadPool(detail_thread_count) + + self.filter_results_dispatcher = FunctionDispatcher(self.filter_results) + self.got_result_details_dispatcher = FunctionDispatcher(self.got_result_details) self.sort_col = 2 self.sort_order = Qt.AscendingOrder @@ -82,10 +85,10 @@ class Matches(QAbstractItemModel): self.search_filter.add_search_result(result) if result.cover_url: result.cover_queued = True - self.cover_pool.add_task(result, self.filter_results) + self.cover_pool.add_task(result, self.filter_results_dispatcher) else: result.cover_queued = False - self.details_pool.add_task(result, store_plugin, self.got_result_details) + self.details_pool.add_task(result, store_plugin, self.got_result_details_dispatcher) self.filter_results() self.layoutChanged.emit() @@ -112,7 +115,7 @@ class Matches(QAbstractItemModel): def got_result_details(self, result): if not result.cover_queued and result.cover_url: result.cover_queued = True - self.cover_pool.add_task(result, self.filter_results) + self.cover_pool.add_task(result, self.filter_results_dispatcher) if result in self.matches: row = self.matches.index(result) self.dataChanged.emit(self.index(row, 0), self.index(row, self.columnCount() - 1)) From 5e3dd658dff6a640a7ef6756bea8d1ead9b2d557 Mon Sep 17 00:00:00 2001 From: John Schember Date: Fri, 27 May 2011 20:10:15 -0400 Subject: [PATCH 05/47] Store: Fully remove Waterstones as its maintainer has dropped it. --- src/calibre/customize/builtins.py | 11 --- .../gui2/store/waterstones_uk_plugin.py | 84 ------------------- 2 files changed, 95 deletions(-) delete mode 100644 src/calibre/gui2/store/waterstones_uk_plugin.py diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py index 70ef1612ee..fb35fa14e9 100644 --- a/src/calibre/customize/builtins.py +++ b/src/calibre/customize/builtins.py @@ -1355,16 +1355,6 @@ class StoreVirtualoStore(StoreBase): headquarters = 'PL' formats = ['EPUB', 'PDF'] -class StoreWaterstonesUKStore(StoreBase): - name = 'Waterstones UK' - author = 'Charles Haley' - description = u'Waterstone\'s mission is to be the leading Bookseller on the High Street and online providing customers the widest choice, great value and expert advice from a team passionate about Bookselling.' - actual_plugin = 'calibre.gui2.store.waterstones_uk_plugin:WaterstonesUKStore' - - drm_free_only = False - headquarters = 'UK' - formats = ['EPUB', 'PDF'] - class StoreWeightlessBooksStore(StoreBase): name = 'Weightless Books' description = u'An independent DRM-free ebooksite devoted to ebooks of all sorts.' @@ -1421,7 +1411,6 @@ plugins += [ StorePragmaticBookshelfStore, StoreSmashwordsStore, StoreVirtualoStore, - #StoreWaterstonesUKStore, StoreWeightlessBooksStore, StoreWizardsTowerBooksStore, StoreWoblinkStore diff --git a/src/calibre/gui2/store/waterstones_uk_plugin.py b/src/calibre/gui2/store/waterstones_uk_plugin.py deleted file mode 100644 index a5065128ba..0000000000 --- a/src/calibre/gui2/store/waterstones_uk_plugin.py +++ /dev/null @@ -1,84 +0,0 @@ -# -*- coding: utf-8 -*- - -from __future__ import (unicode_literals, division, absolute_import, print_function) - -__license__ = 'GPL 3' -__copyright__ = '2011, John Schember ' -__docformat__ = 'restructuredtext en' - -import urllib2 -from contextlib import closing - -from lxml import html - -from PyQt4.Qt import QUrl - -from calibre import browser -from calibre.gui2 import open_url -from calibre.gui2.store import StorePlugin -from calibre.gui2.store.basic_config import BasicStoreConfig -from calibre.gui2.store.search_result import SearchResult -from calibre.gui2.store.web_store_dialog import WebStoreDialog - -class WaterstonesUKStore(BasicStoreConfig, StorePlugin): - - def open(self, parent=None, detail_item=None, external=False): - url = 'http://clkuk.tradedoubler.com/click?p=51196&a=1951604&g=19333484' - url_details = 'http://clkuk.tradedoubler.com/click?p(51196)a(1951604)g(16460516)url({0})' - - if external or self.config.get('open_external', False): - if detail_item: - url = url_details.format(detail_item) - open_url(QUrl(url)) - else: - detail_url = None - if detail_item: - detail_url = url_details.format(detail_item) - d = WebStoreDialog(self.gui, url, parent, detail_url) - d.setWindowTitle(self.name) - d.set_tags(self.config.get('tags', '')) - d.exec_() - - def search(self, query, max_results=10, timeout=60): - url = 'http://www.waterstones.com/waterstonesweb/advancedSearch.do?buttonClicked=1&format=3757&bookkeywords=' + urllib2.quote(query) - - br = browser() - - counter = max_results - with closing(br.open(url, timeout=timeout)) as f: - doc = html.fromstring(f.read()) - for data in doc.xpath('//div[contains(@class, "results-pane")]'): - if counter <= 0: - break - - id = ''.join(data.xpath('./div/div/h2/a/@href')).strip() - if not id: - continue - cover_url = ''.join(data.xpath('.//div[@class="image"]/a/img/@src')) - title = ''.join(data.xpath('./div/div/h2/a/text()')) - author = ', '.join(data.xpath('.//p[@class="byAuthor"]/a/text()')) - price = ''.join(data.xpath('.//p[@class="price"]/span[@class="priceStandard"]/text()')) - drm = data.xpath('boolean(.//td[@headers="productFormat" and contains(., "DRM")])') - pdf = data.xpath('boolean(.//td[@headers="productFormat" and contains(., "PDF")])') - epub = data.xpath('boolean(.//td[@headers="productFormat" and contains(., "EPUB")])') - - counter -= 1 - - s = SearchResult() - s.cover_url = cover_url - s.title = title.strip() - s.author = author.strip() - s.price = price - if drm: - s.drm = SearchResult.DRM_LOCKED - else: - s.drm = SearchResult.DRM_UNKNOWN - s.detail_item = id - formats = [] - if epub: - formats.append('ePub') - if pdf: - formats.append('PDF') - s.formats = ', '.join(formats) - - yield s From 0192aa2da06889f4756af54dca4905d287344bc3 Mon Sep 17 00:00:00 2001 From: John Schember Date: Fri, 27 May 2011 20:13:19 -0400 Subject: [PATCH 06/47] Store: chooser widget, add history. --- .../gui2/store/config/chooser/chooser_widget.py | 2 ++ .../gui2/store/config/chooser/chooser_widget.ui | 14 +++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/calibre/gui2/store/config/chooser/chooser_widget.py b/src/calibre/gui2/store/config/chooser/chooser_widget.py index 93630d69a7..2f8c72d3d0 100644 --- a/src/calibre/gui2/store/config/chooser/chooser_widget.py +++ b/src/calibre/gui2/store/config/chooser/chooser_widget.py @@ -17,6 +17,8 @@ class StoreChooserWidget(QWidget, Ui_Form): QWidget.__init__(self) self.setupUi(self) + self.query.initialize('store_config_chooser_query') + self.adv_search_builder.setIcon(QIcon(I('search.png'))) self.search.clicked.connect(self.do_search) diff --git a/src/calibre/gui2/store/config/chooser/chooser_widget.ui b/src/calibre/gui2/store/config/chooser/chooser_widget.ui index 69117406b1..e833dbf4b9 100644 --- a/src/calibre/gui2/store/config/chooser/chooser_widget.ui +++ b/src/calibre/gui2/store/config/chooser/chooser_widget.ui @@ -31,7 +31,14 @@ - + + + + 0 + 0 + + + @@ -81,6 +88,11 @@ QTreeView
results_view.h
+ + HistoryLineEdit + QLineEdit +
widgets.h
+ From f209a7b079928c6b1516249a5ed0c1df3c36e627 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sat, 28 May 2011 07:07:16 +0100 Subject: [PATCH 07/47] Add format strings to int and float custom columns --- src/calibre/ebooks/metadata/book/base.py | 6 +++ src/calibre/gui2/library/models.py | 10 ++++- .../gui2/preferences/create_custom_column.py | 9 +++++ .../gui2/preferences/create_custom_column.ui | 37 +++++++++++++++++++ 4 files changed, 60 insertions(+), 2 deletions(-) diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py index ceb6751238..5dc3f25dfb 100644 --- a/src/calibre/ebooks/metadata/book/base.py +++ b/src/calibre/ebooks/metadata/book/base.py @@ -628,6 +628,12 @@ class Metadata(object): res = _('Yes') if res else _('No') elif datatype == 'rating': res = res/2.0 + elif datatype in ['int', 'float']: + try: + fmt = cmeta['display'].get('number_format', None) + res = fmt.format(res) + except: + pass return (name, unicode(res), orig_res, cmeta) # convert top-level ids into their value diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py index 86c5871193..554b104c34 100644 --- a/src/calibre/gui2/library/models.py +++ b/src/calibre/gui2/library/models.py @@ -623,7 +623,12 @@ class BooksModel(QAbstractTableModel): # {{{ return None return QVariant(text) - def number_type(r, idx=-1): + def number_type(r, idx=-1, fmt=None): + if fmt is not None: + try: + return QVariant(fmt.format(self.db.data[r][idx])) + except: + pass return QVariant(self.db.data[r][idx]) self.dc = { @@ -674,7 +679,8 @@ class BooksModel(QAbstractTableModel): # {{{ bool_cols_are_tristate= self.db.prefs.get('bools_are_tristate')) elif datatype in ('int', 'float'): - self.dc[col] = functools.partial(number_type, idx=idx) + fmt = self.custom_columns[col]['display'].get('number_format', None) + self.dc[col] = functools.partial(number_type, idx=idx, fmt=fmt) elif datatype == 'datetime': self.dc[col] = functools.partial(datetime_type, idx=idx) elif datatype == 'bool': diff --git a/src/calibre/gui2/preferences/create_custom_column.py b/src/calibre/gui2/preferences/create_custom_column.py index 3a245580dd..f3fe8f03a3 100644 --- a/src/calibre/gui2/preferences/create_custom_column.py +++ b/src/calibre/gui2/preferences/create_custom_column.py @@ -127,6 +127,9 @@ class CreateCustomColumn(QDialog, Ui_QCreateCustomColumn): elif ct == 'enumeration': self.enum_box.setText(','.join(c['display'].get('enum_values', []))) self.enum_colors.setText(','.join(c['display'].get('enum_colors', []))) + elif ct in ['int', 'float']: + if c['display'].get('number_format', None): + self.number_format_box.setText(c['display'].get('number_format', '')) self.datatype_changed() if ct in ['text', 'composite', 'enumeration']: self.use_decorations.setChecked(c['display'].get('use_decorations', False)) @@ -171,6 +174,7 @@ class CreateCustomColumn(QDialog, Ui_QCreateCustomColumn): col_type = None for x in ('box', 'default_label', 'label'): getattr(self, 'date_format_'+x).setVisible(col_type == 'datetime') + getattr(self, 'number_format_'+x).setVisible(col_type in ['int', 'float']) for x in ('box', 'default_label', 'label', 'sort_by', 'sort_by_label', 'make_category'): getattr(self, 'composite_'+x).setVisible(col_type in ['composite', '*composite']) @@ -267,6 +271,11 @@ class CreateCustomColumn(QDialog, Ui_QCreateCustomColumn): display_dict = {'enum_values': l, 'enum_colors': c} elif col_type == 'text' and is_multiple: display_dict = {'is_names': self.is_names.isChecked()} + elif col_type in ['int', 'float']: + if unicode(self.number_format_box.text()).strip(): + display_dict = {'number_format':unicode(self.number_format_box.text()).strip()} + else: + display_dict = {'number_format': None} if col_type in ['text', 'composite', 'enumeration'] and not is_multiple: display_dict['use_decorations'] = self.use_decorations.checkState() diff --git a/src/calibre/gui2/preferences/create_custom_column.ui b/src/calibre/gui2/preferences/create_custom_column.ui index 2bdadd4b9d..02daae988f 100644 --- a/src/calibre/gui2/preferences/create_custom_column.ui +++ b/src/calibre/gui2/preferences/create_custom_column.ui @@ -171,6 +171,20 @@ Everything else will show nothing. + + + + + 0 + 0 + + + + <p>Use 0 (a zero) for the field name. Example: {0:0>5.2f} gives a 5-digit floating point number, 2 digits after the decimal point, with leading zeros + + + + @@ -181,6 +195,19 @@ Everything else will show nothing. + + + + <p>Example: ${0:,.2f} gives floating point number prefixed by a dollar sign, 2 digits after the decimal point, with thousands separated by commas + + + <p>Default: Not formatted. For format language details see <a href="http://docs.python.org/library/string.html#format-string-syntax">the python documentation</a> + + + true + + + @@ -193,6 +220,16 @@ Everything else will show nothing. + + + + Format for &numbers + + + number_format_box + + + From db78e9c45ef2d6cd98eaa02ee6b01a8a0f69e9d2 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sat, 28 May 2011 12:27:49 +0100 Subject: [PATCH 08/47] Fix delegates to deal with formatted numbers --- src/calibre/gui2/library/delegates.py | 33 +++++++++++++++++++-------- src/calibre/gui2/library/views.py | 7 ++++-- 2 files changed, 29 insertions(+), 11 deletions(-) diff --git a/src/calibre/gui2/library/delegates.py b/src/calibre/gui2/library/delegates.py index 50c411aaa4..6990a76b21 100644 --- a/src/calibre/gui2/library/delegates.py +++ b/src/calibre/gui2/library/delegates.py @@ -249,6 +249,23 @@ class CcDateDelegate(QStyledItemDelegate): # {{{ # }}} class CcTextDelegate(QStyledItemDelegate): # {{{ + ''' + Delegate for text data. + ''' + + def createEditor(self, parent, option, index): + m = index.model() + col = m.column_map[index.column()] + editor = MultiCompleteLineEdit(parent) + editor.set_separator(None) + complete_items = sorted(list(m.db.all_custom(label=m.db.field_metadata.key_to_label(col))), + key=sort_key) + editor.update_items_cache(complete_items) + return editor + +# }}} + +class CcNumberDelegate(QStyledItemDelegate): # {{{ ''' Delegate for text/int/float data. ''' @@ -256,25 +273,23 @@ class CcTextDelegate(QStyledItemDelegate): # {{{ def createEditor(self, parent, option, index): m = index.model() col = m.column_map[index.column()] - typ = m.custom_columns[col]['datatype'] - if typ == 'int': + if m.custom_columns[col]['datatype'] == 'int': editor = QSpinBox(parent) editor.setRange(-100, 100000000) editor.setSpecialValueText(_('Undefined')) editor.setSingleStep(1) - elif typ == 'float': + else: editor = QDoubleSpinBox(parent) editor.setSpecialValueText(_('Undefined')) editor.setRange(-100., 100000000) editor.setDecimals(2) - else: - editor = MultiCompleteLineEdit(parent) - editor.set_separator(None) - complete_items = sorted(list(m.db.all_custom(label=m.db.field_metadata.key_to_label(col))), - key=sort_key) - editor.update_items_cache(complete_items) return editor + def setEditorData(self, editor, index): + m = index.model() + val = m.db.data[index.row()][m.custom_columns[m.column_map[index.column()]]['rec_index']] + editor.setValue(val) + # }}} class CcEnumDelegate(QStyledItemDelegate): # {{{ diff --git a/src/calibre/gui2/library/views.py b/src/calibre/gui2/library/views.py index 1cfb04921d..f59473851f 100644 --- a/src/calibre/gui2/library/views.py +++ b/src/calibre/gui2/library/views.py @@ -15,7 +15,7 @@ from PyQt4.Qt import QTableView, Qt, QAbstractItemView, QMenu, pyqtSignal, \ from calibre.gui2.library.delegates import RatingDelegate, PubDateDelegate, \ TextDelegate, DateDelegate, CompleteDelegate, CcTextDelegate, \ CcBoolDelegate, CcCommentsDelegate, CcDateDelegate, CcTemplateDelegate, \ - CcEnumDelegate + CcEnumDelegate, CcNumberDelegate from calibre.gui2.library.models import BooksModel, DeviceBooksModel from calibre.utils.config import tweaks, prefs from calibre.gui2 import error_dialog, gprefs @@ -89,6 +89,7 @@ class BooksView(QTableView): # {{{ self.cc_bool_delegate = CcBoolDelegate(self) self.cc_comments_delegate = CcCommentsDelegate(self) self.cc_template_delegate = CcTemplateDelegate(self) + self.cc_number_delegate = CcNumberDelegate(self) self.display_parent = parent self._model = modelcls(self) self.setModel(self._model) @@ -501,8 +502,10 @@ class BooksView(QTableView): # {{{ self.tags_delegate) else: self.setItemDelegateForColumn(cm.index(colhead), self.cc_text_delegate) - elif cc['datatype'] in ('series', 'int', 'float'): + elif cc['datatype'] == 'series': self.setItemDelegateForColumn(cm.index(colhead), self.cc_text_delegate) + elif cc['datatype'] in ('int', 'float'): + self.setItemDelegateForColumn(cm.index(colhead), self.cc_number_delegate) elif cc['datatype'] == 'bool': self.setItemDelegateForColumn(cm.index(colhead), self.cc_bool_delegate) elif cc['datatype'] == 'rating': From 30743e1b9d4872e014f8a7b5d2528784eb5fb3f6 Mon Sep 17 00:00:00 2001 From: John Schember Date: Sat, 28 May 2011 08:38:30 -0400 Subject: [PATCH 09/47] Store: Give MobileRead it's own advanced search dialog. Fix MobileRead dialog class name. --- .../store/mobileread/adv_search_builder.py | 119 ++++++ .../store/mobileread/adv_search_builder.ui | 350 ++++++++++++++++++ .../store/mobileread/mobileread_plugin.py | 4 +- .../gui2/store/mobileread/store_dialog.py | 6 +- 4 files changed, 473 insertions(+), 6 deletions(-) create mode 100644 src/calibre/gui2/store/mobileread/adv_search_builder.py create mode 100644 src/calibre/gui2/store/mobileread/adv_search_builder.ui diff --git a/src/calibre/gui2/store/mobileread/adv_search_builder.py b/src/calibre/gui2/store/mobileread/adv_search_builder.py new file mode 100644 index 0000000000..8c41f1924b --- /dev/null +++ b/src/calibre/gui2/store/mobileread/adv_search_builder.py @@ -0,0 +1,119 @@ +# -*- coding: utf-8 -*- + +from __future__ import (unicode_literals, division, absolute_import, print_function) + +__license__ = 'GPL 3' +__copyright__ = '2011, John Schember ' +__docformat__ = 'restructuredtext en' + +import re + +from PyQt4.Qt import (QDialog, QDialogButtonBox) + +from calibre.gui2.store.mobileread.adv_search_builder_ui import Ui_Dialog +from calibre.library.caches import CONTAINS_MATCH, EQUALS_MATCH + +class AdvSearchBuilderDialog(QDialog, Ui_Dialog): + + def __init__(self, parent): + QDialog.__init__(self, parent) + self.setupUi(self) + + self.buttonBox.accepted.connect(self.advanced_search_button_pushed) + self.tab_2_button_box.accepted.connect(self.accept) + self.tab_2_button_box.rejected.connect(self.reject) + self.clear_button.clicked.connect(self.clear_button_pushed) + self.adv_search_used = False + self.mc = '' + + self.tabWidget.setCurrentIndex(0) + self.tabWidget.currentChanged[int].connect(self.tab_changed) + self.tab_changed(0) + + def tab_changed(self, idx): + if idx == 1: + self.tab_2_button_box.button(QDialogButtonBox.Ok).setDefault(True) + else: + self.buttonBox.button(QDialogButtonBox.Ok).setDefault(True) + + def advanced_search_button_pushed(self): + self.adv_search_used = True + self.accept() + + def clear_button_pushed(self): + self.title_box.setText('') + self.author_box.setText('') + self.format_box.setText('') + + def tokens(self, raw): + phrases = re.findall(r'\s*".*?"\s*', raw) + for f in phrases: + raw = raw.replace(f, ' ') + phrases = [t.strip('" ') for t in phrases] + return ['"' + self.mc + t + '"' for t in phrases + [r.strip() for r in raw.split()]] + + def search_string(self): + if self.adv_search_used: + return self.adv_search_string() + else: + return self.box_search_string() + + def adv_search_string(self): + mk = self.matchkind.currentIndex() + if mk == CONTAINS_MATCH: + self.mc = '' + elif mk == EQUALS_MATCH: + self.mc = '=' + else: + self.mc = '~' + all, any, phrase, none = map(lambda x: unicode(x.text()), + (self.all, self.any, self.phrase, self.none)) + all, any, none = map(self.tokens, (all, any, none)) + phrase = phrase.strip() + all = ' and '.join(all) + any = ' or '.join(any) + none = ' and not '.join(none) + ans = '' + if phrase: + ans += '"%s"'%phrase + if all: + ans += (' and ' if ans else '') + all + if none: + ans += (' and not ' if ans else 'not ') + none + if any: + ans += (' or ' if ans else '') + any + return ans + + def token(self): + txt = unicode(self.text.text()).strip() + if txt: + if self.negate.isChecked(): + txt = '!'+txt + tok = self.FIELDS[unicode(self.field.currentText())]+txt + if re.search(r'\s', tok): + tok = '"%s"'%tok + return tok + + def box_search_string(self): + mk = self.matchkind.currentIndex() + if mk == CONTAINS_MATCH: + self.mc = '' + elif mk == EQUALS_MATCH: + self.mc = '=' + else: + self.mc = '~' + + ans = [] + self.box_last_values = {} + title = unicode(self.title_box.text()).strip() + if title: + ans.append('title:"' + self.mc + title + '"') + author = unicode(self.author_box.text()).strip() + if author: + ans.append('author:"' + self.mc + author + '"') + format = unicode(self.format_box.text()).strip() + if format: + ans.append('format:"' + self.mc + format + '"') + if ans: + return ' and '.join(ans) + return '' diff --git a/src/calibre/gui2/store/mobileread/adv_search_builder.ui b/src/calibre/gui2/store/mobileread/adv_search_builder.ui new file mode 100644 index 0000000000..7742ccbd97 --- /dev/null +++ b/src/calibre/gui2/store/mobileread/adv_search_builder.ui @@ -0,0 +1,350 @@ + + + Dialog + + + + 0 + 0 + 752 + 472 + + + + Advanced Search + + + + :/images/search.png:/images/search.png + + + + + + &What kind of match to use: + + + matchkind + + + + + + + + Contains: the word or phrase matches anywhere in the metadata field + + + + + Equals: the word or phrase must match the entire metadata field + + + + + Regular expression: the expression must match anywhere in the metadata field + + + + + + + + 0 + + + + A&dvanced Search + + + + + + Find entries that have... + + + + + + + + &All these words: + + + all + + + + + + + + + + + + + + This exact &phrase: + + + all + + + + + + + + + + + + + + &One or more of these words: + + + all + + + + + + + + + + + + + + + But dont show entries that have... + + + + + + + + Any of these &unwanted words: + + + all + + + + + + + + + + + + + 16777215 + 30 + + + + See the <a href="http://calibre-ebook.com/user_manual/gui.html#the-search-interface">User Manual</a> for more help + + + true + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + + + Titl&e/Author/Price ... + + + + + + &Title: + + + title_box + + + + + + + Enter the title. + + + + + + + &Author: + + + author_box + + + + + + + + + &Clear + + + + + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Search only in specific fields: + + + + + + + + + + + + + &Format: + + + format_box + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + EnLineEdit + QLineEdit +
widgets.h
+ + + + all + phrase + any + none + buttonBox + title_box + author_box + format_box + clear_button + tab_2_button_box + tabWidget + matchkind + + + + + + + buttonBox + accepted() + Dialog + accept() + + + 248 + 254 + + + 157 + 274 + + + + + buttonBox + rejected() + Dialog + reject() + + + 316 + 260 + + + 286 + 274 + + + + + diff --git a/src/calibre/gui2/store/mobileread/mobileread_plugin.py b/src/calibre/gui2/store/mobileread/mobileread_plugin.py index 271e34a619..4e11d62bbd 100644 --- a/src/calibre/gui2/store/mobileread/mobileread_plugin.py +++ b/src/calibre/gui2/store/mobileread/mobileread_plugin.py @@ -18,7 +18,7 @@ from calibre.gui2.store.web_store_dialog import WebStoreDialog from calibre.gui2.store.mobileread.models import SearchFilter from calibre.gui2.store.mobileread.cache_progress_dialog import CacheProgressDialog from calibre.gui2.store.mobileread.cache_update_thread import CacheUpdateThread -from calibre.gui2.store.mobileread.store_dialog import MobeReadStoreDialog +from calibre.gui2.store.mobileread.store_dialog import MobileReadStoreDialog class MobileReadStore(BasicStoreConfig, StorePlugin): @@ -38,7 +38,7 @@ class MobileReadStore(BasicStoreConfig, StorePlugin): d.exec_() else: self.update_cache(parent, 30) - d = MobeReadStoreDialog(self, parent) + d = MobileReadStoreDialog(self, parent) d.setWindowTitle(self.name) d.exec_() diff --git a/src/calibre/gui2/store/mobileread/store_dialog.py b/src/calibre/gui2/store/mobileread/store_dialog.py index 7a7b27837d..8908c9bb68 100644 --- a/src/calibre/gui2/store/mobileread/store_dialog.py +++ b/src/calibre/gui2/store/mobileread/store_dialog.py @@ -9,11 +9,11 @@ __docformat__ = 'restructuredtext en' from PyQt4.Qt import (Qt, QDialog, QIcon) -from calibre.gui2.store.search.adv_search_builder import AdvSearchBuilderDialog +from calibre.gui2.store.mobileread.adv_search_builder import AdvSearchBuilderDialog from calibre.gui2.store.mobileread.models import BooksModel from calibre.gui2.store.mobileread.store_dialog_ui import Ui_Dialog -class MobeReadStoreDialog(QDialog, Ui_Dialog): +class MobileReadStoreDialog(QDialog, Ui_Dialog): def __init__(self, plugin, *args): QDialog.__init__(self, *args) @@ -49,8 +49,6 @@ class MobeReadStoreDialog(QDialog, Ui_Dialog): def build_adv_search(self): adv = AdvSearchBuilderDialog(self) - adv.price_label.hide() - adv.price_box.hide() if adv.exec_() == QDialog.Accepted: self.search_query.setText(adv.search_string()) From 40b073c60cd7bea1063677f89c2feed310206d6a Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sat, 28 May 2011 13:54:57 +0100 Subject: [PATCH 10/47] Add heart to search screen --- src/calibre/customize/builtins.py | 8 +++++++- src/calibre/gui2/store/search/models.py | 18 ++++++++++++++++-- src/calibre/gui2/store/search_result.py | 5 +++-- 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py index ad587baf39..ba88d766dc 100644 --- a/src/calibre/customize/builtins.py +++ b/src/calibre/customize/builtins.py @@ -1111,6 +1111,7 @@ class StoreAmazonKindleStore(StoreBase): drm_free_only = False headquarters = 'US' formats = ['KINDLE'] + affiliate = True class StoreAmazonDEKindleStore(StoreBase): name = 'Amazon DE Kindle' @@ -1121,6 +1122,7 @@ class StoreAmazonDEKindleStore(StoreBase): drm_free_only = False headquarters = 'DE' formats = ['KINDLE'] + affiliate = True class StoreAmazonUKKindleStore(StoreBase): name = 'Amazon UK Kindle' @@ -1131,6 +1133,7 @@ class StoreAmazonUKKindleStore(StoreBase): drm_free_only = False headquarters = 'UK' formats = ['KINDLE'] + affiliate = True class StoreArchiveOrgStore(StoreBase): name = 'Archive.org' @@ -1168,6 +1171,7 @@ class StoreBeamEBooksDEStore(StoreBase): drm_free_only = True headquarters = 'DE' formats = ['EPUB', 'MOBI', 'PDF'] + affiliate = True class StoreBeWriteStore(StoreBase): name = 'BeWrite Books' @@ -1233,6 +1237,7 @@ class StoreFoylesUKStore(StoreBase): drm_free_only = False headquarters = 'UK' formats = ['EPUB', 'PDF'] + affiliate = True class StoreGandalfStore(StoreBase): name = 'Gandalf' @@ -1402,6 +1407,7 @@ class StoreEBookShoppeUKStore(StoreBase): drm_free_only = False headquarters = 'UK' formats = ['EPUB', 'PDF'] + affiliate = True plugins += [ StoreArchiveOrgStore, @@ -1432,7 +1438,7 @@ plugins += [ StorePragmaticBookshelfStore, StoreSmashwordsStore, StoreVirtualoStore, - #StoreWaterstonesUKStore, + StoreWaterstonesUKStore, StoreWeightlessBooksStore, StoreWizardsTowerBooksStore, StoreWoblinkStore diff --git a/src/calibre/gui2/store/search/models.py b/src/calibre/gui2/store/search/models.py index 64724be6aa..797195e202 100644 --- a/src/calibre/gui2/store/search/models.py +++ b/src/calibre/gui2/store/search/models.py @@ -10,7 +10,7 @@ import re from operator import attrgetter from PyQt4.Qt import (Qt, QAbstractItemModel, QVariant, QPixmap, QModelIndex, QSize, - pyqtSignal) + pyqtSignal, QIcon) from calibre.gui2 import NONE from calibre.gui2.store.search_result import SearchResult @@ -33,7 +33,7 @@ class Matches(QAbstractItemModel): total_changed = pyqtSignal(int) - HEADERS = [_('Cover'), _('Title'), _('Price'), _('DRM'), _('Store')] + HEADERS = [_('Cover'), _('Title'), _('Price'), _('DRM'), _('Store'), _('')] HTML_COLS = (1, 4) def __init__(self, cover_thread_count=2, detail_thread_count=4): @@ -76,6 +76,7 @@ class Matches(QAbstractItemModel): self.reset() def add_result(self, result, store_plugin): + result.plugin = store_plugin if result not in self.all_matches: self.layoutAboutToBeChanged.emit() self.all_matches.append(result) @@ -175,6 +176,12 @@ class Matches(QAbstractItemModel): return QVariant(self.DRM_UNLOCKED_ICON) elif result.drm == SearchResult.DRM_UNKNOWN: return QVariant(self.DRM_UNKNOWN_ICON) + if col == 5: + if getattr(result.plugin.base_plugin, 'affiliate', False): + icon = QIcon() + icon.addFile(I('donate.png'), QSize(16, 16)) + return QVariant(icon) + return NONE elif role == Qt.ToolTipRole: if col == 1: return QVariant('

%s

' % result.title) @@ -189,6 +196,8 @@ class Matches(QAbstractItemModel): return QVariant('

' + _('The DRM status of this book could not be determined. There is a very high likelihood that this book is actually DRM restricted.') + '

') elif col == 4: return QVariant('

%s

' % result.formats) + elif col == 5: + return QVariant(_('Buying from this store supports a calibre developer')) elif role == Qt.SizeHintRole: return QSize(64, 64) return NONE @@ -208,6 +217,11 @@ class Matches(QAbstractItemModel): text = 'c' elif col == 4: text = result.store_name + elif col == 5: + if getattr(result.plugin.base_plugin, 'affiliate', False): + text = 'y' + else: + text = 'n' return text def sort(self, col, order, reset=True): diff --git a/src/calibre/gui2/store/search_result.py b/src/calibre/gui2/store/search_result.py index 7bf361157e..a3c6a5601e 100644 --- a/src/calibre/gui2/store/search_result.py +++ b/src/calibre/gui2/store/search_result.py @@ -7,11 +7,11 @@ __copyright__ = '2011, John Schember ' __docformat__ = 'restructuredtext en' class SearchResult(object): - + DRM_LOCKED = 1 DRM_UNLOCKED = 2 DRM_UNKNOWN = 3 - + def __init__(self): self.store_name = '' self.cover_url = '' @@ -22,6 +22,7 @@ class SearchResult(object): self.detail_item = '' self.drm = None self.formats = '' + self.plugin = None def __eq__(self, other): return self.title == other.title and self.author == other.author and self.store_name == other.store_name From ddb7afffa9d846b2798e6c7a644d8dc052ebb7eb Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sat, 28 May 2011 13:59:16 +0100 Subject: [PATCH 11/47] Improve handling of affiliate flag. --- src/calibre/gui2/store/search/models.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/calibre/gui2/store/search/models.py b/src/calibre/gui2/store/search/models.py index 797195e202..44a993ef12 100644 --- a/src/calibre/gui2/store/search/models.py +++ b/src/calibre/gui2/store/search/models.py @@ -76,7 +76,7 @@ class Matches(QAbstractItemModel): self.reset() def add_result(self, result, store_plugin): - result.plugin = store_plugin + result.affiliate = getattr(store_plugin.base_plugin, 'affiliate', False) if result not in self.all_matches: self.layoutAboutToBeChanged.emit() self.all_matches.append(result) @@ -177,7 +177,7 @@ class Matches(QAbstractItemModel): elif result.drm == SearchResult.DRM_UNKNOWN: return QVariant(self.DRM_UNKNOWN_ICON) if col == 5: - if getattr(result.plugin.base_plugin, 'affiliate', False): + if result.affiliate: icon = QIcon() icon.addFile(I('donate.png'), QSize(16, 16)) return QVariant(icon) @@ -218,7 +218,7 @@ class Matches(QAbstractItemModel): elif col == 4: text = result.store_name elif col == 5: - if getattr(result.plugin.base_plugin, 'affiliate', False): + if result.affiliate: text = 'y' else: text = 'n' From 07716ef80130943906d2e2bac4ba3d241d9bde8b Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sat, 28 May 2011 14:56:53 +0100 Subject: [PATCH 12/47] Move setting affiliate in the results structure. Add the heart to the list of stores. Initialize 'affiliate' in the thread. --- src/calibre/customize/__init__.py | 4 +++- src/calibre/gui2/actions/store.py | 9 +++++++-- src/calibre/gui2/store/search/download_thread.py | 7 ++++--- src/calibre/gui2/store/search/models.py | 6 ++++-- 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/calibre/customize/__init__.py b/src/calibre/customize/__init__.py index 3d265aed1c..d087eb5351 100644 --- a/src/calibre/customize/__init__.py +++ b/src/calibre/customize/__init__.py @@ -615,7 +615,7 @@ class StoreBase(Plugin): # {{{ version = (1, 0, 1) actual_plugin = None - + # Does the store only distribute ebooks without DRM. drm_free_only = False # This is the 2 letter country code for the corporate @@ -623,6 +623,8 @@ class StoreBase(Plugin): # {{{ headquarters = '' # All formats the store distributes ebooks in. formats = [] + # Is this store on an affiliate program? + affiliate = False def load_actual_plugin(self, gui): ''' diff --git a/src/calibre/gui2/actions/store.py b/src/calibre/gui2/actions/store.py index 6d9720548e..7f9b538bcf 100644 --- a/src/calibre/gui2/actions/store.py +++ b/src/calibre/gui2/actions/store.py @@ -8,7 +8,7 @@ __docformat__ = 'restructuredtext en' from functools import partial -from PyQt4.Qt import QMenu +from PyQt4.Qt import QMenu, QIcon, QSize from calibre.gui2 import error_dialog from calibre.gui2.actions import InterfaceAction @@ -32,8 +32,13 @@ class StoreAction(InterfaceAction): self.store_menu.addAction(_('Search for this book'), self.search_author_title) self.store_menu.addSeparator() self.store_list_menu = self.store_menu.addMenu(_('Stores')) + icon = QIcon() + icon.addFile(I('donate.png'), QSize(16, 16)) for n, p in sorted(self.gui.istores.items(), key=lambda x: x[0].lower()): - self.store_list_menu.addAction(n, partial(self.open_store, p)) + if p.base_plugin.affiliate: + self.store_list_menu.addAction(icon, n, partial(self.open_store, p)) + else: + self.store_list_menu.addAction(n, partial(self.open_store, p)) self.store_menu.addSeparator() self.store_menu.addAction(_('Choose stores'), self.choose) self.qaction.setMenu(self.store_menu) diff --git a/src/calibre/gui2/store/search/download_thread.py b/src/calibre/gui2/store/search/download_thread.py index 1fc74a5748..67b4224981 100644 --- a/src/calibre/gui2/store/search/download_thread.py +++ b/src/calibre/gui2/store/search/download_thread.py @@ -38,7 +38,7 @@ class GenericDownloadThreadPool(object): This must be implemented in a sub class and this function must be called at the end of the add_task function in the sub class. - + The implementation of this function (in this base class) starts any threads necessary to fill the pool if it is not already full. @@ -91,7 +91,7 @@ class SearchThreadPool(GenericDownloadThreadPool): sp = SearchThreadPool(3) sp.add_task(...) ''' - + def __init__(self, thread_count): GenericDownloadThreadPool.__init__(self, SearchThread, thread_count) @@ -120,6 +120,7 @@ class SearchThread(Thread): if not self._run: return res.store_name = store_name + res.affiliate = store_plugin.base_plugin.affiliate self.results.put((res, store_plugin)) self.tasks.task_done() except: @@ -167,7 +168,7 @@ class CoverThread(Thread): class DetailsThreadPool(GenericDownloadThreadPool): - + def __init__(self, thread_count): GenericDownloadThreadPool.__init__(self, DetailsThread, thread_count) diff --git a/src/calibre/gui2/store/search/models.py b/src/calibre/gui2/store/search/models.py index 44a993ef12..f5c24798f6 100644 --- a/src/calibre/gui2/store/search/models.py +++ b/src/calibre/gui2/store/search/models.py @@ -76,7 +76,6 @@ class Matches(QAbstractItemModel): self.reset() def add_result(self, result, store_plugin): - result.affiliate = getattr(store_plugin.base_plugin, 'affiliate', False) if result not in self.all_matches: self.layoutAboutToBeChanged.emit() self.all_matches.append(result) @@ -178,6 +177,8 @@ class Matches(QAbstractItemModel): return QVariant(self.DRM_UNKNOWN_ICON) if col == 5: if result.affiliate: + # For some reason the size(16, 16) is forgotten if the icon + # is a class attribute. Don't know why... icon = QIcon() icon.addFile(I('donate.png'), QSize(16, 16)) return QVariant(icon) @@ -197,7 +198,8 @@ class Matches(QAbstractItemModel): elif col == 4: return QVariant('

%s

' % result.formats) elif col == 5: - return QVariant(_('Buying from this store supports a calibre developer')) + if result.affiliate: + return QVariant(_('Buying from this store supports a calibre developer')) elif role == Qt.SizeHintRole: return QSize(64, 64) return NONE From 3bb508bb1fedbf61dccf54ebe974d3480b1c9d6a Mon Sep 17 00:00:00 2001 From: John Schember Date: Sat, 28 May 2011 10:20:47 -0400 Subject: [PATCH 13/47] Store: Add Waterstones back. --- .../gui2/store/waterstones_uk_plugin.py | 84 +++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 src/calibre/gui2/store/waterstones_uk_plugin.py diff --git a/src/calibre/gui2/store/waterstones_uk_plugin.py b/src/calibre/gui2/store/waterstones_uk_plugin.py new file mode 100644 index 0000000000..a5065128ba --- /dev/null +++ b/src/calibre/gui2/store/waterstones_uk_plugin.py @@ -0,0 +1,84 @@ +# -*- coding: utf-8 -*- + +from __future__ import (unicode_literals, division, absolute_import, print_function) + +__license__ = 'GPL 3' +__copyright__ = '2011, John Schember ' +__docformat__ = 'restructuredtext en' + +import urllib2 +from contextlib import closing + +from lxml import html + +from PyQt4.Qt import QUrl + +from calibre import browser +from calibre.gui2 import open_url +from calibre.gui2.store import StorePlugin +from calibre.gui2.store.basic_config import BasicStoreConfig +from calibre.gui2.store.search_result import SearchResult +from calibre.gui2.store.web_store_dialog import WebStoreDialog + +class WaterstonesUKStore(BasicStoreConfig, StorePlugin): + + def open(self, parent=None, detail_item=None, external=False): + url = 'http://clkuk.tradedoubler.com/click?p=51196&a=1951604&g=19333484' + url_details = 'http://clkuk.tradedoubler.com/click?p(51196)a(1951604)g(16460516)url({0})' + + if external or self.config.get('open_external', False): + if detail_item: + url = url_details.format(detail_item) + open_url(QUrl(url)) + else: + detail_url = None + if detail_item: + detail_url = url_details.format(detail_item) + d = WebStoreDialog(self.gui, url, parent, detail_url) + d.setWindowTitle(self.name) + d.set_tags(self.config.get('tags', '')) + d.exec_() + + def search(self, query, max_results=10, timeout=60): + url = 'http://www.waterstones.com/waterstonesweb/advancedSearch.do?buttonClicked=1&format=3757&bookkeywords=' + urllib2.quote(query) + + br = browser() + + counter = max_results + with closing(br.open(url, timeout=timeout)) as f: + doc = html.fromstring(f.read()) + for data in doc.xpath('//div[contains(@class, "results-pane")]'): + if counter <= 0: + break + + id = ''.join(data.xpath('./div/div/h2/a/@href')).strip() + if not id: + continue + cover_url = ''.join(data.xpath('.//div[@class="image"]/a/img/@src')) + title = ''.join(data.xpath('./div/div/h2/a/text()')) + author = ', '.join(data.xpath('.//p[@class="byAuthor"]/a/text()')) + price = ''.join(data.xpath('.//p[@class="price"]/span[@class="priceStandard"]/text()')) + drm = data.xpath('boolean(.//td[@headers="productFormat" and contains(., "DRM")])') + pdf = data.xpath('boolean(.//td[@headers="productFormat" and contains(., "PDF")])') + epub = data.xpath('boolean(.//td[@headers="productFormat" and contains(., "EPUB")])') + + counter -= 1 + + s = SearchResult() + s.cover_url = cover_url + s.title = title.strip() + s.author = author.strip() + s.price = price + if drm: + s.drm = SearchResult.DRM_LOCKED + else: + s.drm = SearchResult.DRM_UNKNOWN + s.detail_item = id + formats = [] + if epub: + formats.append('ePub') + if pdf: + formats.append('PDF') + s.formats = ', '.join(formats) + + yield s From 93128ab03fe15e2667dfe805dd7c0080a738731d Mon Sep 17 00:00:00 2001 From: John Schember Date: Sat, 28 May 2011 10:23:10 -0400 Subject: [PATCH 14/47] Store: Change ebookshop to use get_details. --- src/calibre/gui2/store/ebookshoppe_uk_plugin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/gui2/store/ebookshoppe_uk_plugin.py b/src/calibre/gui2/store/ebookshoppe_uk_plugin.py index 4ba2a1b5fd..b45b0e99d5 100644 --- a/src/calibre/gui2/store/ebookshoppe_uk_plugin.py +++ b/src/calibre/gui2/store/ebookshoppe_uk_plugin.py @@ -73,7 +73,7 @@ class EBookShoppeUKStore(BasicStoreConfig, StorePlugin): yield s - def my_get_details(self, search_result, timeout): + def get_details(self, search_result, timeout): br = browser() with closing(br.open(search_result.detail_item, timeout=timeout)) as nf: idata = html.fromstring(nf.read()) From 9b245bdcf508964136244cf2ae0a3d9bfb25fb9a Mon Sep 17 00:00:00 2001 From: John Schember Date: Sat, 28 May 2011 10:41:51 -0400 Subject: [PATCH 15/47] Store: ... --- src/calibre/customize/builtins.py | 2 +- src/calibre/gui2/store/ebookshoppe_uk_plugin.py | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py index 0b83d0f45b..c57c19fd0b 100644 --- a/src/calibre/customize/builtins.py +++ b/src/calibre/customize/builtins.py @@ -1420,7 +1420,7 @@ plugins += [ StoreBeWriteStore, StoreDieselEbooksStore, StoreEbookscomStore, - #StoreEBookShoppeUKStore, + StoreEBookShoppeUKStore, StoreEPubBuyDEStore, StoreEHarlequinStore, StoreFeedbooksStore, diff --git a/src/calibre/gui2/store/ebookshoppe_uk_plugin.py b/src/calibre/gui2/store/ebookshoppe_uk_plugin.py index b45b0e99d5..afe4d6ccc5 100644 --- a/src/calibre/gui2/store/ebookshoppe_uk_plugin.py +++ b/src/calibre/gui2/store/ebookshoppe_uk_plugin.py @@ -62,18 +62,17 @@ class EBookShoppeUKStore(BasicStoreConfig, StorePlugin): s = SearchResult() s.cover_url = cover_url s.title = title.strip() - # Set the author to the query terms to ensure that author - # queries match something when pruning searches. Of course, this - # means that all books will match. Sigh... - s.author = query s.price = price s.drm = SearchResult.DRM_UNLOCKED s.detail_item = id - s.formats = '' + + self.my_get_details(s, timeout) + if not s.author: + continue yield s - def get_details(self, search_result, timeout): + def my_get_details(self, search_result, timeout): br = browser() with closing(br.open(search_result.detail_item, timeout=timeout)) as nf: idata = html.fromstring(nf.read()) From b244246fceffdc5781add6a58ee17c4e3d30ed56 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sat, 28 May 2011 16:21:45 +0100 Subject: [PATCH 16/47] Add WH Smith. Improve ebookshoppe_uk --- src/calibre/customize/builtins.py | 60 +++++++++++--- .../gui2/store/ebookshoppe_uk_plugin.py | 8 +- src/calibre/gui2/store/whsmith_uk_plugin.py | 83 +++++++++++++++++++ 3 files changed, 134 insertions(+), 17 deletions(-) create mode 100644 src/calibre/gui2/store/whsmith_uk_plugin.py diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py index 0b83d0f45b..f1afb62cbc 100644 --- a/src/calibre/customize/builtins.py +++ b/src/calibre/customize/builtins.py @@ -1143,6 +1143,7 @@ class StoreArchiveOrgStore(StoreBase): drm_free_only = True headquarters = 'US' formats = ['DAISY', 'DJVU', 'EPUB', 'MOBI', 'PDF', 'TXT'] + affiliate = False class StoreBaenWebScriptionStore(StoreBase): name = 'Baen WebScription' @@ -1152,6 +1153,7 @@ class StoreBaenWebScriptionStore(StoreBase): drm_free_only = True headquarters = 'US' formats = ['EPUB', 'LIT', 'LRF', 'MOBI', 'RB', 'RTF', 'ZIP'] + affiliate = False class StoreBNStore(StoreBase): name = 'Barnes and Noble' @@ -1161,6 +1163,7 @@ class StoreBNStore(StoreBase): drm_free_only = False headquarters = 'US' formats = ['NOOK'] + affiliate = True class StoreBeamEBooksDEStore(StoreBase): name = 'Beam EBooks DE' @@ -1181,6 +1184,7 @@ class StoreBeWriteStore(StoreBase): drm_free_only = True headquarters = 'US' formats = ['EPUB', 'MOBI', 'PDF'] + affiliate = False class StoreDieselEbooksStore(StoreBase): name = 'Diesel eBooks' @@ -1190,6 +1194,7 @@ class StoreDieselEbooksStore(StoreBase): drm_free_only = False headquarters = 'US' formats = ['EPUB', 'PDF'] + affiliate = True class StoreEbookscomStore(StoreBase): name = 'eBooks.com' @@ -1199,6 +1204,18 @@ class StoreEbookscomStore(StoreBase): drm_free_only = False headquarters = 'US' formats = ['EPUB', 'LIT', 'MOBI', 'PDF'] + affiliate = True + +class StoreEPubBuyDEStore(StoreBase): + name = 'EPUBBuy DE' + author = 'Charles Haley' + description = u'Bei EPUBBuy.com finden Sie ausschliesslich eBooks im weitverbreiteten EPUB-Format und ohne DRM. So haben Sie die freie Wahl, wo Sie Ihr eBook lesen: Tablet, eBook-Reader, Smartphone oder einfach auf Ihrem PC. So macht eBook-Lesen Spaß!' + actual_plugin = 'calibre.gui2.store.epubbuy_de_plugin:EPubBuyDEStore' + + drm_free_only = True + headquarters = 'DE' + formats = ['EPUB'] + affiliate = True class StoreEBookShoppeUKStore(StoreBase): name = 'ebookShoppe UK' @@ -1211,16 +1228,6 @@ class StoreEBookShoppeUKStore(StoreBase): formats = ['EPUB', 'PDF'] affiliate = True -class StoreEPubBuyDEStore(StoreBase): - name = 'EPUBBuy DE' - author = 'Charles Haley' - description = u'Bei EPUBBuy.com finden Sie ausschliesslich eBooks im weitverbreiteten EPUB-Format und ohne DRM. So haben Sie die freie Wahl, wo Sie Ihr eBook lesen: Tablet, eBook-Reader, Smartphone oder einfach auf Ihrem PC. So macht eBook-Lesen Spaß!' - actual_plugin = 'calibre.gui2.store.epubbuy_de_plugin:EPubBuyDEStore' - - drm_free_only = True - headquarters = 'DE' - formats = ['EPUB'] - class StoreEHarlequinStore(StoreBase): name = 'eHarlequin' description = u'A global leader in series romance and one of the world\'s leading publishers of books for women. Offers women a broad range of reading from romance to bestseller fiction, from young adult novels to erotic literature, from nonfiction to fantasy, from African-American novels to inspirational romance, and more.' @@ -1229,6 +1236,7 @@ class StoreEHarlequinStore(StoreBase): drm_free_only = False headquarters = 'CA' formats = ['EPUB', 'PDF'] + affiliate = True class StoreFeedbooksStore(StoreBase): name = 'Feedbooks' @@ -1238,6 +1246,7 @@ class StoreFeedbooksStore(StoreBase): drm_free_only = False headquarters = 'FR' formats = ['EPUB', 'MOBI', 'PDF'] + affiliate = False class StoreFoylesUKStore(StoreBase): name = 'Foyles UK' @@ -1259,6 +1268,7 @@ class StoreGandalfStore(StoreBase): drm_free_only = False headquarters = 'PL' formats = ['EPUB', 'PDF'] + affiliate = False class StoreGoogleBooksStore(StoreBase): name = 'Google Books' @@ -1268,6 +1278,7 @@ class StoreGoogleBooksStore(StoreBase): drm_free_only = False headquarters = 'US' formats = ['EPUB', 'PDF', 'TXT'] + affiliate = False class StoreGutenbergStore(StoreBase): name = 'Project Gutenberg' @@ -1277,6 +1288,7 @@ class StoreGutenbergStore(StoreBase): drm_free_only = True headquarters = 'US' formats = ['EPUB', 'HTML', 'MOBI', 'PDB', 'TXT'] + affiliate = False class StoreKoboStore(StoreBase): name = 'Kobo' @@ -1286,6 +1298,7 @@ class StoreKoboStore(StoreBase): drm_free_only = False headquarters = 'CA' formats = ['EPUB'] + affiliate = True class StoreLegimiStore(StoreBase): name = 'Legimi' @@ -1296,6 +1309,7 @@ class StoreLegimiStore(StoreBase): drm_free_only = False headquarters = 'PL' formats = ['EPUB'] + affiliate = False class StoreManyBooksStore(StoreBase): name = 'ManyBooks' @@ -1305,6 +1319,7 @@ class StoreManyBooksStore(StoreBase): drm_free_only = True headquarters = 'US' formats = ['EPUB', 'FB2', 'JAR', 'LIT', 'LRF', 'MOBI', 'PDB', 'PDF', 'RB', 'RTF', 'TCR', 'TXT', 'ZIP'] + affiliate = False class StoreMobileReadStore(StoreBase): name = 'MobileRead' @@ -1314,6 +1329,7 @@ class StoreMobileReadStore(StoreBase): drm_free_only = True headquarters = 'CH' formats = ['EPUB', 'IMP', 'LRF', 'LIT', 'MOBI', 'PDF'] + affiliate = False class StoreNextoStore(StoreBase): name = 'Nexto' @@ -1324,6 +1340,7 @@ class StoreNextoStore(StoreBase): drm_free_only = False headquarters = 'PL' formats = ['EPUB', 'PDF'] + affiliate = True class StoreOpenLibraryStore(StoreBase): name = 'Open Library' @@ -1333,6 +1350,7 @@ class StoreOpenLibraryStore(StoreBase): drm_free_only = True headquarters = 'US' formats = ['DAISY', 'DJVU', 'EPUB', 'MOBI', 'PDF', 'TXT'] + affiliate = False class StoreOReillyStore(StoreBase): name = 'OReilly' @@ -1342,6 +1360,7 @@ class StoreOReillyStore(StoreBase): drm_free_only = True headquarters = 'US' formats = ['APK', 'DAISY', 'EPUB', 'MOBI', 'PDF'] + affiliate = False class StorePragmaticBookshelfStore(StoreBase): name = 'Pragmatic Bookshelf' @@ -1351,6 +1370,7 @@ class StorePragmaticBookshelfStore(StoreBase): drm_free_only = True headquarters = 'US' formats = ['EPUB', 'MOBI', 'PDF'] + affiliate = False class StoreSmashwordsStore(StoreBase): name = 'Smashwords' @@ -1360,6 +1380,7 @@ class StoreSmashwordsStore(StoreBase): drm_free_only = True headquarters = 'US' formats = ['EPUB', 'HTML', 'LRF', 'MOBI', 'PDB', 'RTF', 'TXT'] + affiliate = True class StoreVirtualoStore(StoreBase): name = 'Virtualo' @@ -1370,6 +1391,7 @@ class StoreVirtualoStore(StoreBase): drm_free_only = False headquarters = 'PL' formats = ['EPUB', 'PDF'] + affiliate = False class StoreWaterstonesUKStore(StoreBase): name = 'Waterstones UK' @@ -1380,6 +1402,7 @@ class StoreWaterstonesUKStore(StoreBase): drm_free_only = False headquarters = 'UK' formats = ['EPUB', 'PDF'] + affiliate = False class StoreWeightlessBooksStore(StoreBase): name = 'Weightless Books' @@ -1389,6 +1412,18 @@ class StoreWeightlessBooksStore(StoreBase): drm_free_only = True headquarters = 'US' formats = ['EPUB', 'HTML', 'LIT', 'MOBI', 'PDF'] + affiliate = False + +class StoreWHSmithUKStore(StoreBase): + name = 'WH Smith UK' + author = 'Charles Haley' + description = u"With over 550 stores on the high street and 490 stores at airports, train stations, hospitals and motorway services, WHSmith is one of the UK's leading retail groups and a household name." + actual_plugin = 'calibre.gui2.store.whsmith_uk_plugin:WHSmithUKStore' + + drm_free_only = False + headquarters = 'UK' + formats = ['EPUB', 'PDF'] + affiliate = False class StoreWizardsTowerBooksStore(StoreBase): name = 'Wizards Tower Books' @@ -1398,6 +1433,7 @@ class StoreWizardsTowerBooksStore(StoreBase): drm_free_only = True headquarters = 'UK' formats = ['EPUB', 'MOBI'] + affiliate = False class StoreWoblinkStore(StoreBase): name = 'Woblink' @@ -1408,6 +1444,7 @@ class StoreWoblinkStore(StoreBase): drm_free_only = False headquarters = 'PL' formats = ['EPUB'] + affiliate = False plugins += [ StoreArchiveOrgStore, @@ -1420,7 +1457,7 @@ plugins += [ StoreBeWriteStore, StoreDieselEbooksStore, StoreEbookscomStore, - #StoreEBookShoppeUKStore, + StoreEBookShoppeUKStore, StoreEPubBuyDEStore, StoreEHarlequinStore, StoreFeedbooksStore, @@ -1440,6 +1477,7 @@ plugins += [ StoreVirtualoStore, StoreWaterstonesUKStore, StoreWeightlessBooksStore, + StoreWHSmithUKStore, StoreWizardsTowerBooksStore, StoreWoblinkStore ] diff --git a/src/calibre/gui2/store/ebookshoppe_uk_plugin.py b/src/calibre/gui2/store/ebookshoppe_uk_plugin.py index b45b0e99d5..21bef85db9 100644 --- a/src/calibre/gui2/store/ebookshoppe_uk_plugin.py +++ b/src/calibre/gui2/store/ebookshoppe_uk_plugin.py @@ -62,18 +62,14 @@ class EBookShoppeUKStore(BasicStoreConfig, StorePlugin): s = SearchResult() s.cover_url = cover_url s.title = title.strip() - # Set the author to the query terms to ensure that author - # queries match something when pruning searches. Of course, this - # means that all books will match. Sigh... - s.author = query s.price = price s.drm = SearchResult.DRM_UNLOCKED s.detail_item = id - s.formats = '' + self.get_author_and_formats(s, timeout) yield s - def get_details(self, search_result, timeout): + def get_author_and_formats(self, search_result, timeout): br = browser() with closing(br.open(search_result.detail_item, timeout=timeout)) as nf: idata = html.fromstring(nf.read()) diff --git a/src/calibre/gui2/store/whsmith_uk_plugin.py b/src/calibre/gui2/store/whsmith_uk_plugin.py new file mode 100644 index 0000000000..66d81258f7 --- /dev/null +++ b/src/calibre/gui2/store/whsmith_uk_plugin.py @@ -0,0 +1,83 @@ +# -*- coding: utf-8 -*- + +from __future__ import (unicode_literals, division, absolute_import, print_function) + +__license__ = 'GPL 3' +__copyright__ = '2011, John Schember ' +__docformat__ = 'restructuredtext en' + +import urllib2 +from contextlib import closing + +from lxml import html + +from PyQt4.Qt import QUrl + +from calibre import browser +from calibre.gui2 import open_url +from calibre.gui2.store import StorePlugin +from calibre.gui2.store.basic_config import BasicStoreConfig +from calibre.gui2.store.search_result import SearchResult +from calibre.gui2.store.web_store_dialog import WebStoreDialog + +class WHSmithUKStore(BasicStoreConfig, StorePlugin): + + def open(self, parent=None, detail_item=None, external=False): + url = 'http://www.whsmith.co.uk/' + url_details = '' + + if external or self.config.get('open_external', False): + if detail_item: + url = url_details + detail_item + open_url(QUrl(url)) + else: + detail_url = None + if detail_item: + detail_url = url_details + detail_item + d = WebStoreDialog(self.gui, url, parent, detail_url) + d.setWindowTitle(self.name) + d.set_tags(self.config.get('tags', '')) + d.exec_() + + def search(self, query, max_results=10, timeout=60): + url = ('http://www.whsmith.co.uk/CatalogAndSearch/SearchWithinCategory.aspx' + '?cat=\Books\eb_eBooks&gq=' + urllib2.quote(query)) + + br = browser() + + counter = max_results + with closing(br.open(url, timeout=timeout)) as f: + doc = html.fromstring(f.read()) + for data in doc.xpath('//div[@class="product-search"]/' + 'div[contains(@id, "whsSearchResultItem")]'): + if counter <= 0: + break + + id = ''.join(data.xpath('.//a[contains(@id, "labelProductTitle")]/@href')) + if not id: + continue + cover_url = ''.join(data.xpath('.//a[contains(@id, "hlinkProductImage")]/img/@src')) + title = ''.join(data.xpath('.//a[contains(@id, "labelProductTitle")]/text()')) + author = ', '.join(data.xpath('.//div[@class="author"]/h3/span/text()')) + price = ''.join(data.xpath('.//span[contains(@id, "labelProductPrice")]/text()')) + pdf = data.xpath('boolean(.//span[contains(@id, "labelFormatText") and ' + 'contains(., "PDF")])') + epub = data.xpath('boolean(.//span[contains(@id, "labelFormatText") and ' + 'contains(., "ePub")])') + counter -= 1 + + s = SearchResult() + s.cover_url = cover_url + s.title = title.strip() + s.author = author.strip() + s.price = price + s.drm = SearchResult.DRM_LOCKED + s.detail_item = id + formats = [] + if epub: + formats.append('ePub') + if pdf: + formats.append('PDF') + s.formats = ', '.join(formats) + + yield s From 66571550e9181a39debcbdad8ded2c80d89886d7 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sat, 28 May 2011 16:57:37 +0100 Subject: [PATCH 17/47] Add the heart to the search store chooser --- src/calibre/customize/builtins.py | 2 +- src/calibre/gui2/store/search/search.py | 28 ++++++++++++++++--------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py index f1afb62cbc..cd5f81067f 100644 --- a/src/calibre/customize/builtins.py +++ b/src/calibre/customize/builtins.py @@ -1417,7 +1417,7 @@ class StoreWeightlessBooksStore(StoreBase): class StoreWHSmithUKStore(StoreBase): name = 'WH Smith UK' author = 'Charles Haley' - description = u"With over 550 stores on the high street and 490 stores at airports, train stations, hospitals and motorway services, WHSmith is one of the UK's leading retail groups and a household name." + description = u"Shop for savings on Books, discounted Magazine subscriptions and great prices on Stationery, Toys & Games" actual_plugin = 'calibre.gui2.store.whsmith_uk_plugin:WHSmithUKStore' drm_free_only = False diff --git a/src/calibre/gui2/store/search/search.py b/src/calibre/gui2/store/search/search.py index faeaf507c9..7ce6c93c68 100644 --- a/src/calibre/gui2/store/search/search.py +++ b/src/calibre/gui2/store/search/search.py @@ -9,8 +9,8 @@ __docformat__ = 'restructuredtext en' import re from random import shuffle -from PyQt4.Qt import (Qt, QDialog, QDialogButtonBox, QTimer, QCheckBox, - QVBoxLayout, QIcon, QWidget, QTabWidget) +from PyQt4.Qt import (Qt, QDialog, QDialogButtonBox, QTimer, QCheckBox, QLabel, + QVBoxLayout, QIcon, QWidget, QTabWidget, QGridLayout) from calibre.gui2 import JSONConfig, info_dialog from calibre.gui2.progress_indicator import ProgressIndicator @@ -80,7 +80,7 @@ class SearchDialog(QDialog, Ui_Dialog): self.progress_checker.start(100) self.restore_state() - + def setup_store_checks(self): # Add check boxes for each store so the user # can disable searching specific stores on a @@ -88,18 +88,26 @@ class SearchDialog(QDialog, Ui_Dialog): existing = {} for n in self.store_checks: existing[n] = self.store_checks[n].isChecked() - + self.store_checks = {} stores_check_widget = QWidget() - store_list_layout = QVBoxLayout() + store_list_layout = QGridLayout() stores_check_widget.setLayout(store_list_layout) - for x in sorted(self.gui.istores.keys(), key=lambda x: x.lower()): + + icon = QIcon(I('donate.png')) + i = 0 # just in case the list of stores is empty + for i, x in enumerate(sorted(self.gui.istores.keys(), key=lambda x: x.lower())): cbox = QCheckBox(x) cbox.setChecked(existing.get(x, False)) - store_list_layout.addWidget(cbox) + store_list_layout.addWidget(cbox, i, 0, 1, 1) + if self.gui.istores[x].base_plugin.affiliate: + iw = QLabel(self) + iw.setPixmap(icon.pixmap(16, 16)) + store_list_layout.addWidget(iw, i, 1, 1, 1) self.store_checks[x] = cbox - store_list_layout.addStretch() + i += 1 + store_list_layout.setRowStretch(i, 10) self.store_list.setWidget(stores_check_widget) def build_adv_search(self): @@ -250,14 +258,14 @@ class SearchDialog(QDialog, Ui_Dialog): button_box.accepted.connect(d.accept) button_box.rejected.connect(d.reject) d.setWindowTitle(_('Customize get books search')) - + tab_widget = QTabWidget(d) v.addWidget(tab_widget) v.addWidget(button_box) chooser_config_widget = StoreChooserWidget() search_config_widget = StoreConfigWidget(self.config) - + tab_widget.addTab(chooser_config_widget, _('Choose stores')) tab_widget.addTab(search_config_widget, _('Configure search')) From 3a93e4561ce20dd76bfb1f6af3593b9989818f2b Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sat, 28 May 2011 18:59:30 +0100 Subject: [PATCH 18/47] Fix amazon UK grid. Add tooltip to heart on menu. --- src/calibre/gui2/store/amazon_uk_plugin.py | 84 ++++++++++++++++++++++ src/calibre/gui2/store/search/search.py | 1 + 2 files changed, 85 insertions(+) diff --git a/src/calibre/gui2/store/amazon_uk_plugin.py b/src/calibre/gui2/store/amazon_uk_plugin.py index 9544add17c..1448e1548a 100644 --- a/src/calibre/gui2/store/amazon_uk_plugin.py +++ b/src/calibre/gui2/store/amazon_uk_plugin.py @@ -6,11 +6,17 @@ __license__ = 'GPL 3' __copyright__ = '2011, John Schember ' __docformat__ = 'restructuredtext en' +import urllib +from contextlib import closing + +from lxml import html from PyQt4.Qt import QUrl +from calibre import browser from calibre.gui2 import open_url from calibre.gui2.store.amazon_plugin import AmazonKindleStore +from calibre.gui2.store.search_result import SearchResult class AmazonUKKindleStore(AmazonKindleStore): ''' @@ -28,3 +34,81 @@ class AmazonUKKindleStore(AmazonKindleStore): aff_id['asin'] = detail_item store_link = 'http://www.amazon.co.uk/gp/redirect.html?ie=UTF8&location=http://www.amazon.co.uk/dp/%(asin)s&tag=%(tag)s&linkCode=ur2&camp=1634&creative=6738' % aff_id open_url(QUrl(store_link)) + + def search(self, query, max_results=10, timeout=60): + url = self.search_url + urllib.quote_plus(query) + br = browser() + + counter = max_results + with closing(br.open(url, timeout=timeout)) as f: + doc = html.fromstring(f.read()) + + # Amazon has two results pages. + is_shot = doc.xpath('boolean(//div[@id="shotgunMainResults"])') + # Horizontal grid of books. + if is_shot: + data_xpath = '//div[contains(@class, "result")]' + cover_xpath = './/div[@class="productTitle"]//img/@src' + # Vertical list of books. + else: + data_xpath = '//div[contains(@class, "product")]' + cover_xpath = './div[@class="productImage"]/a/img/@src' + + for data in doc.xpath(data_xpath): + if counter <= 0: + break + + # We must have an asin otherwise we can't easily reference the + # book later. + asin = ''.join(data.xpath('./@name')) + if not asin: + continue + cover_url = ''.join(data.xpath(cover_xpath)) + + title = ''.join(data.xpath('.//div[@class="productTitle"]/a/text()')) + price = ''.join(data.xpath('.//div[@class="newPrice"]/span/text()')) + + counter -= 1 + + s = SearchResult() + s.cover_url = cover_url.strip() + s.title = title.strip() + s.price = price.strip() + s.detail_item = asin.strip() + s.formats = 'Kindle' + + if is_shot: + # Amazon UK does not include the author on the grid layout + s.author = '' + self.get_details(s, timeout) + else: + author = ''.join(data.xpath('.//div[@class="productTitle"]/span[@class="ptBrand"]/text()')) + s.author = author.split(' by ')[-1].strip() + + yield s + + def get_details(self, search_result, timeout): + # We might already have been called. + if search_result.drm: + return + + url = self.details_url + + br = browser() + with closing(br.open(url + search_result.detail_item, timeout=timeout)) as nf: + idata = html.fromstring(nf.read()) + if not search_result.author: + search_result.author = ''.join(idata.xpath('//div[@class="buying" and contains(., "Author")]/a/text()')) + if idata.xpath('boolean(//div[@class="content"]//li/b[contains(text(), "' + + self.drm_search_text + '")])'): + if idata.xpath('boolean(//div[@class="content"]//li[contains(., "' + + self.drm_free_text + '") and contains(b, "' + + self.drm_search_text + '")])'): + search_result.drm = SearchResult.DRM_UNLOCKED + else: + search_result.drm = SearchResult.DRM_UNKNOWN + else: + search_result.drm = SearchResult.DRM_LOCKED + return True + + diff --git a/src/calibre/gui2/store/search/search.py b/src/calibre/gui2/store/search/search.py index 7ce6c93c68..9e60223a3d 100644 --- a/src/calibre/gui2/store/search/search.py +++ b/src/calibre/gui2/store/search/search.py @@ -103,6 +103,7 @@ class SearchDialog(QDialog, Ui_Dialog): store_list_layout.addWidget(cbox, i, 0, 1, 1) if self.gui.istores[x].base_plugin.affiliate: iw = QLabel(self) + iw.setToolTip(_('Buying from this store supports a calibre developer')) iw.setPixmap(icon.pixmap(16, 16)) store_list_layout.addWidget(iw, i, 1, 1, 1) self.store_checks[x] = cbox From 0f0efc1ca17d94bf2540d6a792270a742e0ecaf6 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sat, 28 May 2011 19:42:36 +0100 Subject: [PATCH 19/47] Some improvements to the number format tooltips. --- src/calibre/gui2/preferences/create_custom_column.py | 12 ++++++++++++ src/calibre/gui2/preferences/create_custom_column.ui | 8 +++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/calibre/gui2/preferences/create_custom_column.py b/src/calibre/gui2/preferences/create_custom_column.py index f3fe8f03a3..8eaa2dd7d9 100644 --- a/src/calibre/gui2/preferences/create_custom_column.py +++ b/src/calibre/gui2/preferences/create_custom_column.py @@ -182,6 +182,18 @@ class CreateCustomColumn(QDialog, Ui_QCreateCustomColumn): getattr(self, 'enum_'+x).setVisible(col_type == 'enumeration') self.use_decorations.setVisible(col_type in ['text', 'composite', 'enumeration']) self.is_names.setVisible(col_type == '*text') + if col_type == 'int': + self.number_format_box.setToolTip('

' + + _('Examples: The format {0:0>4d} ' + 'gives a 4-digit number with leading zeros. The format ' + '{0:d} days prints the number then the word "days"')+ '

') + elif col_type == 'float': + self.number_format_box.setToolTip('

' + + _('Examples: The format {0:.1f} gives a floating ' + 'point number with 1 digit after the decimal point. The format ' + 'Price: $ {0:,.2f} prints ' + '"Price $ " then displays the number with 2 digits ' + 'after the decimal point and thousands separated by commas.') + '

') def accept(self): col = unicode(self.column_name_box.text()).strip() diff --git a/src/calibre/gui2/preferences/create_custom_column.ui b/src/calibre/gui2/preferences/create_custom_column.ui index 02daae988f..cedbfd72b8 100644 --- a/src/calibre/gui2/preferences/create_custom_column.ui +++ b/src/calibre/gui2/preferences/create_custom_column.ui @@ -179,10 +179,6 @@ Everything else will show nothing. 0 - - <p>Use 0 (a zero) for the field name. Example: {0:0>5.2f} gives a 5-digit floating point number, 2 digits after the decimal point, with leading zeros - - @@ -198,7 +194,9 @@ Everything else will show nothing. - <p>Example: ${0:,.2f} gives floating point number prefixed by a dollar sign, 2 digits after the decimal point, with thousands separated by commas + <p>The format specifier must begin with <code>{0:</code> +and end with <code>}</code> You can have text before and after the format specifier. + <p>Default: Not formatted. For format language details see <a href="http://docs.python.org/library/string.html#format-string-syntax">the python documentation</a> From 542d65bdc000f54e5d4c5a53430640a707d8ae40 Mon Sep 17 00:00:00 2001 From: John Schember Date: Sat, 28 May 2011 15:42:31 -0400 Subject: [PATCH 20/47] Store: Remove redundant setting of variables. --- src/calibre/customize/builtins.py | 38 ------------------------------- 1 file changed, 38 deletions(-) diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py index cd5f81067f..5cde30f72e 100644 --- a/src/calibre/customize/builtins.py +++ b/src/calibre/customize/builtins.py @@ -1108,7 +1108,6 @@ class StoreAmazonKindleStore(StoreBase): description = u'Kindle books from Amazon.' actual_plugin = 'calibre.gui2.store.amazon_plugin:AmazonKindleStore' - drm_free_only = False headquarters = 'US' formats = ['KINDLE'] affiliate = True @@ -1119,7 +1118,6 @@ class StoreAmazonDEKindleStore(StoreBase): description = u'Kindle Bücher von Amazon.' actual_plugin = 'calibre.gui2.store.amazon_de_plugin:AmazonDEKindleStore' - drm_free_only = False headquarters = 'DE' formats = ['KINDLE'] affiliate = True @@ -1130,7 +1128,6 @@ class StoreAmazonUKKindleStore(StoreBase): description = u'Kindle books from Amazon\'s UK web site. Also, includes French language ebooks.' actual_plugin = 'calibre.gui2.store.amazon_uk_plugin:AmazonUKKindleStore' - drm_free_only = False headquarters = 'UK' formats = ['KINDLE'] affiliate = True @@ -1143,7 +1140,6 @@ class StoreArchiveOrgStore(StoreBase): drm_free_only = True headquarters = 'US' formats = ['DAISY', 'DJVU', 'EPUB', 'MOBI', 'PDF', 'TXT'] - affiliate = False class StoreBaenWebScriptionStore(StoreBase): name = 'Baen WebScription' @@ -1153,14 +1149,12 @@ class StoreBaenWebScriptionStore(StoreBase): drm_free_only = True headquarters = 'US' formats = ['EPUB', 'LIT', 'LRF', 'MOBI', 'RB', 'RTF', 'ZIP'] - affiliate = False class StoreBNStore(StoreBase): name = 'Barnes and Noble' description = u'The world\'s largest book seller. As the ultimate destination for book lovers, Barnes & Noble.com offers an incredible array of content.' actual_plugin = 'calibre.gui2.store.bn_plugin:BNStore' - drm_free_only = False headquarters = 'US' formats = ['NOOK'] affiliate = True @@ -1184,14 +1178,12 @@ class StoreBeWriteStore(StoreBase): drm_free_only = True headquarters = 'US' formats = ['EPUB', 'MOBI', 'PDF'] - affiliate = False class StoreDieselEbooksStore(StoreBase): name = 'Diesel eBooks' description = u'Instant access to over 2.4 million titles from hundreds of publishers including Harlequin, HarperCollins, John Wiley & Sons, McGraw-Hill, Simon & Schuster and Random House.' actual_plugin = 'calibre.gui2.store.diesel_ebooks_plugin:DieselEbooksStore' - drm_free_only = False headquarters = 'US' formats = ['EPUB', 'PDF'] affiliate = True @@ -1201,7 +1193,6 @@ class StoreEbookscomStore(StoreBase): description = u'Sells books in multiple electronic formats in all categories. Technical infrastructure is cutting edge, robust and scalable, with servers in the US and Europe.' actual_plugin = 'calibre.gui2.store.ebooks_com_plugin:EbookscomStore' - drm_free_only = False headquarters = 'US' formats = ['EPUB', 'LIT', 'MOBI', 'PDF'] affiliate = True @@ -1223,7 +1214,6 @@ class StoreEBookShoppeUKStore(StoreBase): description = u'We made this website in an attempt to offer the widest range of UK eBooks possible across and as many formats as we could manage.' actual_plugin = 'calibre.gui2.store.ebookshoppe_uk_plugin:EBookShoppeUKStore' - drm_free_only = False headquarters = 'UK' formats = ['EPUB', 'PDF'] affiliate = True @@ -1233,7 +1223,6 @@ class StoreEHarlequinStore(StoreBase): description = u'A global leader in series romance and one of the world\'s leading publishers of books for women. Offers women a broad range of reading from romance to bestseller fiction, from young adult novels to erotic literature, from nonfiction to fantasy, from African-American novels to inspirational romance, and more.' actual_plugin = 'calibre.gui2.store.eharlequin_plugin:EHarlequinStore' - drm_free_only = False headquarters = 'CA' formats = ['EPUB', 'PDF'] affiliate = True @@ -1243,10 +1232,8 @@ class StoreFeedbooksStore(StoreBase): description = u'Feedbooks is a cloud publishing and distribution service, connected to a large ecosystem of reading systems and social networks. Provides a variety of genres from independent and classic books.' actual_plugin = 'calibre.gui2.store.feedbooks_plugin:FeedbooksStore' - drm_free_only = False headquarters = 'FR' formats = ['EPUB', 'MOBI', 'PDF'] - affiliate = False class StoreFoylesUKStore(StoreBase): name = 'Foyles UK' @@ -1254,7 +1241,6 @@ class StoreFoylesUKStore(StoreBase): description = u'Foyles of London\'s ebook store. Provides extensive range covering all subjects.' actual_plugin = 'calibre.gui2.store.foyles_uk_plugin:FoylesUKStore' - drm_free_only = False headquarters = 'UK' formats = ['EPUB', 'PDF'] affiliate = True @@ -1265,20 +1251,16 @@ class StoreGandalfStore(StoreBase): description = u'Księgarnia internetowa Gandalf.' actual_plugin = 'calibre.gui2.store.gandalf_plugin:GandalfStore' - drm_free_only = False headquarters = 'PL' formats = ['EPUB', 'PDF'] - affiliate = False class StoreGoogleBooksStore(StoreBase): name = 'Google Books' description = u'Google Books' actual_plugin = 'calibre.gui2.store.google_books_plugin:GoogleBooksStore' - drm_free_only = False headquarters = 'US' formats = ['EPUB', 'PDF', 'TXT'] - affiliate = False class StoreGutenbergStore(StoreBase): name = 'Project Gutenberg' @@ -1288,14 +1270,12 @@ class StoreGutenbergStore(StoreBase): drm_free_only = True headquarters = 'US' formats = ['EPUB', 'HTML', 'MOBI', 'PDB', 'TXT'] - affiliate = False class StoreKoboStore(StoreBase): name = 'Kobo' description = u'With over 2.3 million eBooks to browse we have engaged readers in over 200 countries in Kobo eReading. Our eBook listings include New York Times Bestsellers, award winners, classics and more!' actual_plugin = 'calibre.gui2.store.kobo_plugin:KoboStore' - drm_free_only = False headquarters = 'CA' formats = ['EPUB'] affiliate = True @@ -1306,10 +1286,8 @@ class StoreLegimiStore(StoreBase): description = u'Tanie oraz darmowe ebooki, egazety i blogi w formacie EPUB, wprost na Twój e-czytnik, iPhone, iPad, Android i komputer' actual_plugin = 'calibre.gui2.store.legimi_plugin:LegimiStore' - drm_free_only = False headquarters = 'PL' formats = ['EPUB'] - affiliate = False class StoreManyBooksStore(StoreBase): name = 'ManyBooks' @@ -1319,7 +1297,6 @@ class StoreManyBooksStore(StoreBase): drm_free_only = True headquarters = 'US' formats = ['EPUB', 'FB2', 'JAR', 'LIT', 'LRF', 'MOBI', 'PDB', 'PDF', 'RB', 'RTF', 'TCR', 'TXT', 'ZIP'] - affiliate = False class StoreMobileReadStore(StoreBase): name = 'MobileRead' @@ -1329,7 +1306,6 @@ class StoreMobileReadStore(StoreBase): drm_free_only = True headquarters = 'CH' formats = ['EPUB', 'IMP', 'LRF', 'LIT', 'MOBI', 'PDF'] - affiliate = False class StoreNextoStore(StoreBase): name = 'Nexto' @@ -1337,7 +1313,6 @@ class StoreNextoStore(StoreBase): description = u'Największy w Polsce sklep internetowy z audiobookami mp3, ebookami pdf oraz prasą do pobrania on-line.' actual_plugin = 'calibre.gui2.store.nexto_plugin:NextoStore' - drm_free_only = False headquarters = 'PL' formats = ['EPUB', 'PDF'] affiliate = True @@ -1350,7 +1325,6 @@ class StoreOpenLibraryStore(StoreBase): drm_free_only = True headquarters = 'US' formats = ['DAISY', 'DJVU', 'EPUB', 'MOBI', 'PDF', 'TXT'] - affiliate = False class StoreOReillyStore(StoreBase): name = 'OReilly' @@ -1360,7 +1334,6 @@ class StoreOReillyStore(StoreBase): drm_free_only = True headquarters = 'US' formats = ['APK', 'DAISY', 'EPUB', 'MOBI', 'PDF'] - affiliate = False class StorePragmaticBookshelfStore(StoreBase): name = 'Pragmatic Bookshelf' @@ -1370,7 +1343,6 @@ class StorePragmaticBookshelfStore(StoreBase): drm_free_only = True headquarters = 'US' formats = ['EPUB', 'MOBI', 'PDF'] - affiliate = False class StoreSmashwordsStore(StoreBase): name = 'Smashwords' @@ -1388,10 +1360,8 @@ class StoreVirtualoStore(StoreBase): description = u'Księgarnia internetowa, która oferuje bezpieczny i szeroki dostęp do książek w formie cyfrowej.' actual_plugin = 'calibre.gui2.store.virtualo_plugin:VirtualoStore' - drm_free_only = False headquarters = 'PL' formats = ['EPUB', 'PDF'] - affiliate = False class StoreWaterstonesUKStore(StoreBase): name = 'Waterstones UK' @@ -1399,10 +1369,8 @@ class StoreWaterstonesUKStore(StoreBase): description = u'Waterstone\'s mission is to be the leading Bookseller on the High Street and online providing customers the widest choice, great value and expert advice from a team passionate about Bookselling.' actual_plugin = 'calibre.gui2.store.waterstones_uk_plugin:WaterstonesUKStore' - drm_free_only = False headquarters = 'UK' formats = ['EPUB', 'PDF'] - affiliate = False class StoreWeightlessBooksStore(StoreBase): name = 'Weightless Books' @@ -1412,7 +1380,6 @@ class StoreWeightlessBooksStore(StoreBase): drm_free_only = True headquarters = 'US' formats = ['EPUB', 'HTML', 'LIT', 'MOBI', 'PDF'] - affiliate = False class StoreWHSmithUKStore(StoreBase): name = 'WH Smith UK' @@ -1420,10 +1387,8 @@ class StoreWHSmithUKStore(StoreBase): description = u"Shop for savings on Books, discounted Magazine subscriptions and great prices on Stationery, Toys & Games" actual_plugin = 'calibre.gui2.store.whsmith_uk_plugin:WHSmithUKStore' - drm_free_only = False headquarters = 'UK' formats = ['EPUB', 'PDF'] - affiliate = False class StoreWizardsTowerBooksStore(StoreBase): name = 'Wizards Tower Books' @@ -1433,7 +1398,6 @@ class StoreWizardsTowerBooksStore(StoreBase): drm_free_only = True headquarters = 'UK' formats = ['EPUB', 'MOBI'] - affiliate = False class StoreWoblinkStore(StoreBase): name = 'Woblink' @@ -1441,10 +1405,8 @@ class StoreWoblinkStore(StoreBase): description = u'Czytanie zdarza się wszędzie!' actual_plugin = 'calibre.gui2.store.woblink_plugin:WoblinkStore' - drm_free_only = False headquarters = 'PL' formats = ['EPUB'] - affiliate = False plugins += [ StoreArchiveOrgStore, From 3a28da796faa9b84f213b79ec0fb1e2c0ab6fe99 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 28 May 2011 14:02:32 -0600 Subject: [PATCH 21/47] Move User Manual to http://manual.calibre-ebook.com --- Changelog.old.yaml | 2 +- Changelog.yaml | 6 +++--- INSTALL | 2 +- README | 4 ++-- icons/favicon.ico | Bin 0 -> 161418 bytes setup/installer/windows/wix-template.xml | 2 +- setup/upload.py | 4 ++-- src/calibre/ebooks/conversion/cli.py | 2 +- src/calibre/gui2/actions/help.py | 2 +- src/calibre/gui2/convert/font_key.ui | 2 +- src/calibre/gui2/convert/heuristics.ui | 2 +- src/calibre/gui2/convert/search_and_replace.ui | 2 +- src/calibre/gui2/convert/xpath_wizard.ui | 2 +- src/calibre/gui2/dialogs/search.ui | 2 +- src/calibre/gui2/dialogs/user_profiles.ui | 2 +- src/calibre/gui2/filename_pattern.ui | 2 +- src/calibre/gui2/preferences/look_feel.py | 2 +- .../store/config/chooser/adv_search_builder.ui | 2 +- .../gui2/store/search/adv_search_builder.ui | 2 +- src/calibre/gui2/wizard/finish.ui | 2 +- src/calibre/manual/conf.py | 14 +++++++++++--- src/calibre/utils/help2man.py | 2 +- 22 files changed, 35 insertions(+), 27 deletions(-) create mode 100644 icons/favicon.ico diff --git a/Changelog.old.yaml b/Changelog.old.yaml index 0d556d99e0..0bdd7ba746 100644 --- a/Changelog.old.yaml +++ b/Changelog.old.yaml @@ -478,7 +478,7 @@ type: major description : > "You can now save your frequently used searches and access them with a single click. For details - see http://calibre-ebook.com/user_manual/gui.html#search-sort" + see http://manual.calibre-ebook.com/gui.html#search-sort" - title: "Add searching by date/published date" tickets: [5244] diff --git a/Changelog.yaml b/Changelog.yaml index 48770df7ab..ee3d240115 100644 --- a/Changelog.yaml +++ b/Changelog.yaml @@ -584,7 +584,7 @@ - title: "FB2 Output: Option to set the FB2 genre explicitly." tickets: [743178] - - title: "Plugin developers: calibre now has a new plugin API, see http://calibre-ebook.com/user_manual/creating_plugins.html. Your existing plugins should continue to work, but it would be good to test them to make sure." + - title: "Plugin developers: calibre now has a new plugin API, see http://manual.calibre-ebook.com/creating_plugins.html. Your existing plugins should continue to work, but it would be good to test them to make sure." bug fixes: - title: "Fix text color in the search bar set to black instead of the system font color" @@ -969,7 +969,7 @@ new features: - title: "Tag Browser: Support the creation of nested User Categories" - description: "See http://calibre-ebook.com/user_manual/gui.html#tag-browser for details" + description: "See http://manual.calibre-ebook.com/gui.html#tag-browser for details" type: major - title: "Disable Kent District Library plugin to download series information. The website could not handle the load calibre's 2 million users put on it. You can manually re-enable it if you really want series information, but it is very slow" @@ -3842,7 +3842,7 @@ type: major description: > "You can now change the icons used in the User Interface and other static resources. Details on how to - do this are at: http://calibre-ebook.com/user_manual/customize.html#overriding-icons-templates-etcetera" + do this are at: http://manual.calibre-ebook.com/customize.html#overriding-icons-templates-etcetera" - title: "Split the 'Send to device' button into two buttons, 'Connect/share' and 'Send to device'. The new 'Send to device' button will now only be available when a device is connected." diff --git a/INSTALL b/INSTALL index 93b119b2e1..0520ef1e38 100644 --- a/INSTALL +++ b/INSTALL @@ -3,7 +3,7 @@ calibre supports installation from source, only on Linux. Note that you *do not* need to install from source to hack on the calibre source code. To get started with calibre development, use a normal calibre install and follow the instructions at -http://calibre-ebook.com/user_manual/develop.html +http://manual.calibre-ebook.com/develop.html On Linux, there are two kinds of installation from source possible. Note that both kinds require lots of dependencies as well as a diff --git a/README b/README index b518e977c8..2ffab4e2f6 100644 --- a/README +++ b/README @@ -6,8 +6,8 @@ reading. It is cross platform, running on Linux, Windows and OS X. For screenshots: https://calibre-ebook.com/demo -For installation/usage instructions please see -http://calibre-ebook.com/user_manual +For usage instructions please see +http://manual.calibre-ebook.com For source code access: bzr branch lp:calibre diff --git a/icons/favicon.ico b/icons/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..433b4f2d5153f8e44736f5d9c4f24b2c3ff3efa4 GIT binary patch literal 161418 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 BCkhwd}oZeWm&ZIrzWFkUCY* zZr6IhSlBEkUgU(#m1HdE4ajeP@foCi0%rE*AmI4f!v->q$#8$aKby0G#r7~c zX|mynmd@{@BrMmb27y5gt(`HO~NQ~fk(|g6J8bT6JR zXNbV``RAi!HJoQMa{5G>xcb@l25Hrx))P~1ZOfsk?!{pORg=B!!rMgsUWS$Oni1We z@BcV0!duu}!Y?t`at%z&J=l5u+($CP=`M?oKCUHrfASpei zPsD?H&Q6&e)?mw6)`ld4tX4AmWu}=RG)>#lWVKaIwcm{pr{WCq?m`J7tMN2x8bUG3 zC+%BuIjotQFmm*%2OrTWoUkt0+DHa(dX$;X(?${Ge<^^?m1$XTHRS*hv&K) z|NAO%gklTS4?yAdI6k}K{{;JdWD~AH|6X;E__`Nt@cz-`I|gffP#2 zXahk$mj~+l?lSfNo=<#r4alIa0GH_Z(U~a!-Tg?GHeSq9NP#wE}-#>Cl+ zsEL1{9oat*u8wXEo!-RFM&CtWjtf~UBpS8X9GJ1y`?Kp~-0*dMJb7vB&Z3l0*tn6Y zn#i;ehd&8XfUiPECdL{BwKmWSU0q4tjov$bQ}cbrk@aP2E{(mb-O}wdbm2W*U*Dxf zR+Xr{PtK$CQJM+$MpG3k#rxa!f^x@eM>m#ZS(l+e&*ghZ=G1S<4{7J`2H`v2;|AX< zM^+C<#_>OMyyp)-|6ASO#m)D6M(4-WoD)?RVDAUY;0o0Nc%`wvbKbQ(V7Le0^9bLn z@OSeaJp6U`k-fqJxGDnt3y}3cHFzfz2zYQvW8TZTd3n_D$hd6|2uKicQx}=@BoAaasu16{%~UB5oysV$`N3$MNEl;g(^wNvU+wga!6@(FjMB z-;MYxUlb`LMg*#piG2KhCx0yLF}%iYhXzPHoZXNT@O??q?|R+MDwNI)JT^4{d=$Kg zxr!wTd|nkK8MuZgl=nXtyw@ES-s7ztHnJIAgQFP|A6<*;RVr6XjAO1#^CEMsw_TIgrZ`O-rkv2`ift0W zhtvb5nJC#WSwwJ>eG*oOt;f`l1}3ak)D7;|r!h!(h9N`rv7tIscab5)ZA1#^5_pW# ziG4NzP9d>(A;|6&Bks#cm$S{cb;>=N6ytuI-mCs+fB^oL2ABb_xk<~WX?t#xgUK!~ zuSQHNwjw$SuNAc~&;kGDl|*U#yh4iWW>95bDi`5~|E+5@YYLWTMWG8y{7mNB9GMJ} zm)XTA^WZf9$G)G>v^)pgiX$v|xm)C!-l6ZAyh}lr!991!bS#0sD+AEYH?aTFhv|Ee zBGd1?@Hn}H;N>!VF}`=`lt*QK6_K?0dL_ms;_h+bFQ0MieznUspR%vey@L(CWOUt5D2Zo;6At!YvU_ad=f4SbDA?n?2m}Ex0mCi59*c=aeobB zI%#$sQ5%1}eE~SUKyWRi0_|}<85{OqYI3?$TfqW)E+51BL5NPziEt^}f)-Ax?9$(i zkt!*Ujz%fLQk1Zo$}e>8J6eJo0Cnfzv=?*b%c$3ECJ&0wawv7^YRT-V(+V5%k04n( z@xGjkfuG5(I<81K%?XRcP@QfYpQnNy7obbkb9(R z2-<A?7l~WuXwi$xU6N7s}#gCxUk_5cb+3 zV;~k4V4jS$GK2o;gagKq!$5jBNXHt7V5lBX&EtBvS~?ji6@o-7%S0rAauiZ83#Ylen! zU#aYs&+$Q(i-Wj{2OrAc$+6n0+3@ekse06`XLUq<;^D^-x)+jzA#KK0#u%zc_EggT zyVBEbPAsmXm4V?mg<8FPXvK0|+~~apA{|7pl1`!&)%AA=bvv&7{jaWT--KJYXOI)) zw!TO=Rm0u^c%%Z7LNgQTBwSvX zLXK!dI2T`sC+LAXouyL;CZz+Z_|ACvjgEM*SScntT?un%$FNg;GhFUVo>~mRNpG0p{_uo-0u}m>asiPkm z7WElaI&>JZc)N85r8E?i!KmcJ=hP99V;J8>#(5+@=9$u-*NF&x;r>o)dkJ3&uKa{Z7% zp?zNWBjZ({5bD&jQhWFcxH`py>2h|JdQ%s6Nc(V1svu0d=p<^}Pi~{tU^y`_M3tsf zEk>=XbyeLL=5pnx*Awi&f;2Q&(MW9mwICWl(gg8x3>L&juU{jNNB?8)&z8dLIgo6+ zW3gbLgk9aq!i|&OOMn*ntW3?a>NdJVJ57ZRRcf;rlvUQqj#yYKn5=@Fvd=KDu+Na{ zpt@9^NsefW8gfIlAXw3hZmJr-@~^ZBcdaOP_rBGJrEv0mRm+9R$!4om0-TP3G7 zsHXh+61mRNr34JYAU!z)%L08)HbrCYD#8&%{3l$;%0eAx77Fu%a`z#7uyn&!02Lqo zmeu;h#mmKIg;x+{ry6GO&tl%jt`BY1q0=@6QxdY`VXE=4xbpC%ikT{>e=RuDz&HM` zSLflS2S;iRJ`xWxZYk@0PKtH;le8AnasLSGhDcRJ+LcA0x9rDVhXsDnr$N>8Asby@ zi^vY-9$6PLn*&DM8lP1{*g26-g{O zgoXyClwH>*>RhE9<3IG%QM{WlA)01vMmOPrS*-prX$Rq_mh4YO1oq0o+$r5an&?xHwt=wknr_()= zzg_(xxsTK;Kh+FH)ior!742u6a$GKExZWRv-{19WRsXQsP7b$^Ntd{@qV`iUraJ;V zOk$Vh#8w*)Ms&8i3=F1Oec8Udzf6GNgk}l=wcLsng7HZtG_c;*DM?&9f1Y1kK~G4 zkk&QzaPn=2Epfe5NXjay?4Bk(Y9~sDQnOk#QwT}8ocTa!vg}KRQQR{Cd%M262Z^G8 z%pv1==#djpqMPwOb^Nu5;%vM0)(LxlcVoAY;>$U=fZq0aM_egHVv zl_tVes<-+jOSpuG=l#L>c1xDlpRbxe#=L?9fW`8^yyr>0B744FrH|_aG}ztCoGI`s z$Kz2e4g7rr&Gr@L**Q!Bd{d(o%^IT|0Dg$S2``+WS#z{z_|o*ttY^6H&rW|FyNM7? zH?*IoU6aqi2D5E_BCApd?rFs`ex!vVti3cjzTpQw*oM+80-#_#=QqVhv9U=8HiZy>w-##{0w#_wweMG zXn^4H-#)Q{xp+16^>lUccV_F4%~U9VXn_i$QwrL@!b|MQCF($ppF38a<#L{=8N8$< zO1do}1Pz6dOVN^hrrqk--HqF5O0i4T&Gi=CaL2A)E^J=AdVx3qcR~Ko#DwO%Y>(}( z7Ngh0rVPMHZDLN1ejsL4L}!5IuLceqF^r?k;p72|u7;GaR#*IhzW31D(T& zw@QH6ETTM->P+-gObbu_67FKud7X}fGi2{@Z{$*VUP(c(v~C_~sv?F?!Xh}U?ZrB0 zMPEDn#MX){jlT@DS^3))@>HxDvc+|EUJ%V$Ni+06`P{wkjr3<-#y?&yu1$1q>yQ4g zU$7qtKVrJ69l#TVfO9BdC3{hj6%Lu~7k zT2^b*J&qNymJYJfYX7})JH=$$eE%TdYhQk5WI*uqY_n5vK_sLFOhWEcyn|Q-5dwz@ zKztjV9PQEUW5(0@0wp$+{Ws;kvnr?6kPk9xRkODU<{(3@p~@1q6M|%r`)PUl?V#Ws zh&*99z0D>=>Lz#2A>BB3x?A$#{oIw6l%1?Qie+rnALGC7_}x19gVa5*K~IMCULvOa zJXGN|=JH)mF`iDO?w#Ul*HW8~$mREL$%?iNQux0t84`s0ecA6u340nPzVm$9<*{TJ%a+-#wRu1YK0BOV!Qjmf4lYyjoX<%G3i<>`Y#c~ zSoz`Wi)@;VW->5TZs_a@hT^G1$)Y~F1X2MI8~D1b&!!xGOj`!nH4Nn3R{|a&-k)Cy z9>794UIdbn_fM|fvATUqULV;njGN0&dkuq-W#ho-YZkN`U!>WVd#S!S$%o`yBrU1J zE0a=MD1Ip5pxw&b>os+D;C7)33^5S6S;1S0)>{35lbU+6>*vSTHmN=_kJc{F)-}(Y z+onZh6K|`+b@Ft6$l|NAb!pmZ+B|=$Zz9e>YDm;03db1X85YbNqe@~AoR}F1hAK`# z<#&Ah0ne&TZgXmvsgo**_BtA z*1-34J!*S3U1&6XU;pd`JP0g~V+P3nL|hjfoW9#Ff0nR-?D}IMO(e|iAh^K)(yMwR zBkwXRVQ`ntQlw_r_^>|4135PpYOcko8#P94DdwbkebIISSXiL3ht&@UD$AZL#Yz&r z6sxAHMc1}O66PdrraC8@00XQi8zGocpMO+{cTKP9kMsh2j>Pkw%OfW>Bi^jV7dM8E(X33J9-P6>Ko_u`gW&$+s30) z&XJ`mQBf`?0qL3+ur8MN1MSLnuCPt2W@C2svOVCDOs~>wRN#1I!`z#G2N=$^VBG}g z6eN6mDl$d-PyJk%h<~jz>n;5JIT__Sp56u5+-l9{RPEPy18|=a_xcSzEJR?1g}zRs z&#h&&cS=f3+*-^sjU;iQI8IeLa~mo#F>PmOyxP<~U$*J5D z9!D(5o9BMN>+7${k+kjii?`jmAB*o+uOi^dQb3eKe;Yqepa8Ac9lO3`v41~lVC(2R zNHOuw3an{DvfnCEIt-4J#gnH2yT!`7ZN`ullnESS5GaupBZyVwuR45h^p_Pbm36N> zO!30p$8>RAB~^uomQ$s!A(rB7MN*1+idO5ubX+N_Cy1HV znT9GO>beoTUwf0?;h!F-laxGVO#o!IAV{4?QpkXLcWW5=BOu7>1QWl(RFL9C3$D!FB2LT3&x21Dke}Bwp+HhaE>nHDlMjl&}&V%+|%P9`N%<5+A5r z;i$LS=u4~pVVZ^=}ulvPpl z-N-cE)5@e}6t!`g$T-&=8SCr&^Iz9+#gKD;PovdB-20Ew-s}5q6|=CmVja6m9yXfz zhb(0Y7b38po%M+GdPJ)vT_QdtZqm&Rx-uTXoP_6;FF85gpYl@Q@tcjsm7fR;5P6Mq z5*~$|GuVn&t8xhJiFv0#>kERE-Ze)6RLVAzM6o|7{|Zudi}m6**!44sv~A^CWm+fd z=x3}L0c=&~*PXc43gn4&R@;yuB5-~IVgkCwdPaCJzm5=&E~1^(HgXBE#-f~ZH*#+k zWAzcP!<4yCs{q#0vRq8Jvy_jKIVk|Pr5T%4-=MYp%V~s&Z}7x1R9czF;u)g=bSU3$ zx|F3&uL2yUFTci3(9nw7e zU12bEG9yGzV3owx6e4M(1UGK58#>N-RlK7_|9YF!2V+>|{q}Oqu%ovn*f}a`2~vjN zsRj^<*Ril;aXkKI#F*0Dpg4j$^1p3oFHo8L{FmPzpeP&W2zb~!E_kcBss}c_d($t) zmA^K5MO@Ds>m`BZvD}8<;4FHNsq6#sZKC$e?~eI2#l}TK;~tS84o2wr56ph;P5mzL znc6-mV}sI4uq>LzUoqljbK?0}gmE+@Z)6_@CZ=n@%|=HT`NdZ#^h*gx3pr90d# z;to6xd=7k5Fns+u%KUzcxCVt8-<>!ry-ZjYNR}!q>qr^*@rKRqM#hs`pr*y!#wJsL z-7QoY`e&*M4^EfdT(fl1vtAB?Ng2|DzbkouZs%iblWKEa?|Vdg5B^|yG|9i3C9mKg=-~ETU;8O%Im-B zWYLStcG$uB!=T8v(0ylFnV1KpO?y5Ntwsz+v$sbUuG02(%z7@QNap14ba`9ns;XM-j;vN`tvhWW=pa#*gfjw;QQOE!9rM4xYj96RE|Dz5FEYKL{T&haPd=T$uI=`cd@{;(0ppVw z&ODR28#_vi*R4RqB2=CoAgcOyy1au3oK@Z6G{7y0sKd0Ox-eU?NJT7(75AGx!*^n~ z`^A>FURWuvdRA<%%-r)M)+wzk8M`~am!Y-;?XrXLA&N4YrkwBJVO?|fbdF!l@|n7g zgt`5MyRMbkxx5aw%w0ABXMvjUp8?XV0WS_yBfv5SLVuU+e7VmG*Bzhr8Ni*3n7D}e zNWEddKGRLRB$yu80sw{1ylU=kgKP{gXLbDe4%eV`?$M)ow z!uQSivM%ducppvH*@QKgs$AVmMtWyf41d=;Z*`^&sqaT$zBx-5dbY1FZ^XnV;$vX!hmVmn z_@DrH#=h$d)%p73?@%;8&>J%0kZ$oMVn#6OMzEB7uMpRsdGT4A))>6b3{U}x0A@WQ zxx_2Yx^=_1&haUntW@qRZL*uUhMm$*iXhgP+<#j(G4R2`do!6w8X5{ zjZ{h&f`!RA*5ghbc*cBH5dFTJnDORbU~7bsW-PV@Dq@`qhe-93 zn_lL!eOSOb!tS0&EUEHZ2&Eo-tBfhNzVmig_4ab`>J%fU{?^=f6(f0_$i2n+*T6@? z$*909U|WFap^RhI-Ooa!|NegEph>_R$u!~m#u)QJHX4k5-wU6JL8Es=AcOK;i-6>E zKw!KFbJIaCsLN4U!3YrA`e_sw;zLJpj4aVeS zH4xqp@ba)2eJ~Zq^2~{vRw57*QA!Ly$fQa8dZ1M71qSh;DyGw7I`qD~vEP78kP55e zMfd5{II!;iF=}?a+&C$o|M_0YirYU~absTB!7xrHdQK8@&Mr)W7AsWpk6Xt}VjySV zRUKXs*Y(HCwmL^@Snuy{ce;eVfd9TCl=OYm%pMrZua?()Q;B$;ZhJ7=t3*q=s~K&! zGmpL>$ufu~L?9sipk}a8`fw-n(5pMi8pcliku>J2wrHmK5A=daE#VGpir|`Qp7_I= zU11A;G5uxPh}~c&n{(t-;rEsOI5Rn&mYG@!@>y}iTlrYq`)UMM1>DV5B;4{o?ok8F zuaJ|nd#+Ta!!G(pdD`DzG5s{ zCn)SZqIt_S{C}GYu_QTyEJ(38v8$ugPzQ^t6Va}YZqkmIRh??q-3@PI>-UK2X!c6^ zE0+tZ-!?+(KIa#&{``z62lsXFbRWe#$>5{6jNp=C$^Ds1AnQ^R;VH~WS?Q0!PZE)& zmc=;foyWT64@Q{T!OdS1MQSjjIDeGZU6obPUoUhOSiD_E99`m4S*pXO zuJP3CpQq#=AuU?-%`JDa4UXQUc=jgk9+D>-I=el0+(|ZyqW*Jy4SiaGp z0B5ZH-70Gd>TFvLKMrnved7(^FL8cm>H{pANxggB`o4h~0yvd|bfxsmlzsJg%tYs` zuOxJ9Xx*8c_>?Z5`TTh);UbMj=>%Fck{Kv@#9D#FjH0y&3&^Hr?zF`v%w(p)7Yhwm zDwjf;>c^K5B2fziAABF50|6Evg}&|5bs}?)j8uKy_ai5P!1i2X_Ke^g9@K

;NjNe4DdZ*FYmj5P2kxESpOXdZ0HzxxnfZVjPpOZa{u;8D6(CEreRM=I>~Wqvs9&GyJq0M7t+;QuB1gAo6p^adL5I;CuP}1pxL0Yy%h9 z_8tx1Mj5_>hzDz&$_E}ktggIpY^q&Kk6+3h9qQyN;}M4WPL$u1C5GO#`(RRoI; zdfTMvSokZlWjK?u^(yt-N!s8tN+M1Z5Y}}{FX)UM+tg|hP14j;xw%{#;n|new@JFB z2D^@rpSSP42FmS|eor%(&R$(qTO!6`NW$tL?&6+1H-Q*+y2K0ho2Z#V<>Jejb@pO#E3hNcl*0O0H|iY zZm8}zwjkP-jY?6k|B@hdnIMnh79NB6RG|3kG3KSS^2wS^Qgr654o}cwEG* z$d0>^9Er%QctLaX$y_2X&~)_+sM9j6f!pL)s2#AAWcBKf2&#tD2%Q}NJ;?aM!5WcH zNZhtZ?YZRmX!QmTajB!N?pq9Ydv{)zVN)MT+M40mEirNTwRJ#jHn2~3sk%YM(z6Qp zw%id&PoDW2u3G+%mY;u9jZBWO!Q}ng@iWbLF}S(p{^=k2QTj6_}*?gQy_H>EZ^nXu7V_e-8TF{By@ z&??YNMv722bkKUVmUKgK2MLhR+Z`eo+QG<%{AvvM8Uu`#YYIB|)J!_f94s;z(sMM1 zz0Q?1RfG;Fo*?5^rHIQ&D%HBnGNks_c{=slH#vu`o5=nvYZ7b*1V1Tg4z!otw#Ryl zynF7IjU43lqyrCbeMff;NLI%bI6%A~HY-L)D`J zMH0uQ>EPvaO{f|$8#j@IV7j!*oR#NX1o3WJv4n}{%k12M0p|oIss9T z%$eD$>h;~&vk+qLlUW~PTjd!G8pQm!Lukq5B(*E09$efwKdg2sY&=YMu#v*H)QV(KgB7M$Y1LCD))D^vb$UaV#DDuU;m{xO2q0f>hffNG#$8x=5PxP}4>{6Y}i3{`z ziu{4MH2s!0r(&%(D2ImvBIaSlZWTjgm9l%{JiGYdV~RB?!fL4^dl=Ehl<{`wR@frt?iEHZXH5b%Q2D%JV#B4EkS zgwdTECN`1Kix(#~!HR6!|F_Yzf#VZXTtdgP(bM#3(vJ@ZBmtH%+qEv#LcU?RJ`a{! zvS8So zJ9QWT98YdmJ7q=_eT-G7Djz^Cwa-iZD#T$I>=P)aD$l!8R(gfPzdAba0NG=8Z(%~K zq@mApAH#atzSk|eE62umY;9RsMTz^|Tg`4@qEdd7>Z+btw9lnfS8|-MjN}Q*09%84 z85?}UKRnz8-jaDmcGCoiZ+@Id%Z22@a<6=Ijho5vd=E|S7wPjhm|8)*!@Ow6EtR+M z%ez5z^KWfGw=d4$Gx^9#sE_t+Pu%O+K8^?ZcW?T9`nWMW z%4>X`w5cHN_wvm~I?818giH81M5y2_PLJM`2Hj_ze3m3KT}W}kA#q)#;AWSaC7--_ zW&r5~(Yc}yGIpPjiP74Z=Sn|NL~1Z3S^4ziAmM!fW7#Y|L)$}k#Byl+7UT&(h`btO z{`H+{sFz!0rd$xNOpA7Fs)J*(`J=~$n$+1I8$IUK$?6vvP59chjjR9usb+%6#MKS8 z6vqJ{>-`^e>51SMyDSQ1-eIr?Jd&w1W)e&RDq|)j4Klb*)MbJ=zl0i2AmF$vXtTio5~o<^f`Ef}#P$yX<*sy7b=^V(B)uy?Wy^~RhNo&H87u|g&< z*$khON3ejhNebFV!#cPOOSgh<)ygU`tGgSnd3wd3Al;vvG+k3jy<~`3_)I_(UKSB@ zS{h%Vy%(G8!i+*a^jD-K^!D*vW+dj^4nHCtlq9TpZ2cFm@RaeE_Vw87(F-Uz1+De+ zDy~QwPzZS4_6DJexZxxPg&;%q&qMJBwfiq;%(^=iqAE)&DO~k&A5qgbs(rHIx=&^U z#(w8&Qy3%?y~Y5_*2h6IQi4|JUw5xN@F<6u6Lp+{vu*T;?sTo}H~H%?Az!D@j5*eXL6P6r6BQS7+}le`rbTHR_5wcH9b9aw*AEi9 z1G+qEC6<&BM?jR zs`p2UsdP}pgTS4qDNCcPG^^-+bZ4r#ac%Xc(3Pp{^9sr9%O|!Wd3LYPOy73*_e-s~r0g=)F*h&v-qNz=ox2Kv}4wYLy%RT$5*6o_t4p58I z=N|-AQQ0(J?UHq;1UWvos~B56%hB&_>tvtfga79^CM6vsVnqog5oSIJ0=)gsZ3U#JvZmQ>2wZo z#EHiIbfFE7dmKPT@qqfVA-xY@tPUVC_iP!I)%!ydi1An8B`@N1|8a2JAdO{u;h{&_|y`Py#yyyc`QiBjS*3~{0H zMiO)0_{VnDHd43*n%bT2nMusYrckKpZX$bP%FXh`54*5IKJ{jsV*3Fu`BV~^N;6Ey zgi<8Qo^J=)4LHQ`URo(oP;;md{>$aNwjW(BXK41p0a*>$&$j_`H0(f-c$oNFmLF-|J z`oNBp?G=71YrrZcY&xWed?nIs?tjWF0@#W66a{>*@&Uz~S{}i!n{p6pK_>gs^OG^M zWIbE(z2>$7C>^Fb!*#dZ)D~wr{{`=E>El(-b#&?-o+NYgmE16_yne1I0@SLzWMsFZ z`nXcmqS4Eh$uKWZCzaEfRWaKZD9-t8L^bR2={J_I3&XRMRqLv6J8b^Dt$Y~dxmjpJ zF}Y+Jl@WW@S>_v@Do}^w#b>O*z8o!EO&Q4e<>BsmF>3%_Ics5-l>cHidkm15L5G<*sYUN0k4_?$57e zljfNOm<{r0*C%O=^&h5s{}Yaahu3rJ@9%#Sz0SBDlYusbEBreMfK6r}Q8O@XtGq(v z)d4k%@3N9Sn1WKJTo>PyNo{w}g5cVG*8Y@)`}QKu#2__^7C*E3VAQk?t$ogjV~2YDE}tL*m6?p3MH17PQZI;!@P(%;z= zY>r_U2#zt$?&s6l?8Sbf9K? zf01`x!d1Tkg3O)b&a_n-B0Df~>gyF(_c=n_(XYG9hk9Czn-h}wA-b{7Ril*7AAg_M zw)#O7tp%P|6O6AC!L=gukd>dOad4uuU%bil;iBUp*gl10;?Vz_BoOg?IcvD85P%Ns z*8>GwKbGzTtHK!b!ntL|{C@Syp_V_yfytCwIRm_EFWihMN1#D>={O-nFk@t?uoBBr z92Vif?q|keJyI;E`dzcc=>*z7uW&)OBZTwmU~G~D^}*Ii!yIM&cm+YUI5FZ%oEj}d z&0ekv)8i{jEq+Q995>>3606LZ)!w{w&22~dyCZ3TtJ(cGjZ34~+jMwkJ6W>6Hk_bhM=YkOe9Gy`3dRLMueev{*t5ra-;vM*zQYr9%XmUu81!B z-8>1AR~<}=KBA~YGwjJ=SuObhlOvD5`vyA0I%f;8FqDr(Qc`ZH23dp?tx}eQ47hVu zmE#Z%F7M~pUl7yotAL&2p_ePvj^K<(SWexk1bL8_-bB)e$Xi0j$0ZzA5^*hLnyY<(P)_`Mxa!L*?SEBZndTrb@Y-^bfc73v3HS`ammGB0Vki!BcoYM77IDW8YEMt68f4NT z0=#SK3XKgIZ`6PqIZqF{&x^__ZE6>1+hrSS!|ERdBtQDTT9B3+>WR;C$`;C_Xn>oH zppoVaM&NS$IOVxdzljjp#~FGsXYaI1+MjHT*?6nC@U_;(k?&~TbfG$D1@wcyFZD%g zNaHQNL!ah?@?w+wa3qzlWX`&zl{FVtV_Io3^9#-Rr0pn%b9uYXTRe zHk+5QYq$ZP1|d=KU&$15?QpvN{5~o@4Inpd@%oPu^M#fTp2U9j+<%?z3!Oxhj*(?U z=p$ya&hGT-8`hth)B3Utzz+x8gR^@4XRSLi4FnUq(fEv{_D!G84mHI%l@DaY!npfa zCM@-MD z-7zCjEpA|X>^ZT0^Enx9eVLQX%PB1%0u%4~Q8yl*(JqB$sX z+n&%B#X1l0z2({bY*x;KArrWkI=q4bvbgcjT)@SKciWrS)NvPp`)F0u?bif<1W|-3 zVmpo7^(ph$I}hO$7n0`EB>ZNpKj!>lnN0iPJ_4vhDTQ>#SS3-!JFg4d@wwNz+TMN& zP2aCss|hmPdP|#k+E_#D@VkeSIHCm$=hx09 zxrFdY3j0eHL2?5Pqg&|ur!EDF_}MS{HmVG>4*Q&eX#Q1exgZYgNKXnMdA!MK`RwpN zef{$ZKp%#>W}`Z%Mr0teeulze7j%o8e$c>uQtuoW%85&VSs9_s5s$v349#uRyucsd zN%;3%8v4$%p#>sdGrG&GfTK`TP5tJBbbW3x4O=KNVZjp>`se6&a}0dzp;Q23ltIr; zBGBf5?efwL>vy2ft5CCSJ;{e!M1Jjl4o&N${=JRSbLO%L7NN-V4ffVcL`(AM)M6gAxU#DQShX^CBsD2ec-)#2lEGNdOj$6zVxbsxV-LYjO(+{ z*4wzRnt*ux`8pts%l(pfWO~T>SJm84nRtiZn>NUqd#?N9Kc8;+m)PDU@Y+imAWYM! zQx%Y!^&--9W`hnSvc0n%GlLcPk7WFZSn}C;(m(&9fu81tq6lv9k`A9Z=S}**+ HB{Ts5R49cS literal 0 HcmV?d00001 diff --git a/setup/installer/windows/wix-template.xml b/setup/installer/windows/wix-template.xml index 8526c27720..d4bfbc3c7c 100644 --- a/setup/installer/windows/wix-template.xml +++ b/setup/installer/windows/wix-template.xml @@ -69,7 +69,7 @@ WorkingDirectory="APPLICATIONROOTDIRECTORY" /> + Target="http://manual.calibre-ebook.com"/> diff --git a/setup/upload.py b/setup/upload.py index e448bc11e4..a0138a42e4 100644 --- a/setup/upload.py +++ b/setup/upload.py @@ -16,7 +16,7 @@ from setup import Command, __version__, installer_name, __appname__ PREFIX = "/var/www/calibre-ebook.com" DOWNLOADS = PREFIX+"/htdocs/downloads" BETAS = DOWNLOADS +'/betas' -USER_MANUAL = PREFIX+'/htdocs/user_manual' +USER_MANUAL = '/var/www/localhost/htdocs/' HTML2LRF = "calibre/ebooks/lrf/html/demo" TXT2LRF = "src/calibre/ebooks/lrf/txt/demo" MOBILEREAD = 'ftp://dev.mobileread.com/calibre/' @@ -365,7 +365,7 @@ class UploadUserManual(Command): # {{{ self.build_plugin_example(x) check_call(' '.join(['scp', '-r', 'src/calibre/manual/.build/html/*', - 'divok:%s'%USER_MANUAL]), shell=True) + 'bugs:%s'%USER_MANUAL]), shell=True) # }}} class UploadDemo(Command): # {{{ diff --git a/src/calibre/ebooks/conversion/cli.py b/src/calibre/ebooks/conversion/cli.py index b03887469d..1767019972 100644 --- a/src/calibre/ebooks/conversion/cli.py +++ b/src/calibre/ebooks/conversion/cli.py @@ -40,7 +40,7 @@ To get help on them specify the input and output file and then use the -h \ option. For full documentation of the conversion system see -''') + 'http://calibre-ebook.com/user_manual/conversion.html' +''') + 'http://manual.calibre-ebook.com/conversion.html' HEURISTIC_OPTIONS = ['markup_chapter_headings', 'italicize_common_cases', 'fix_indents', diff --git a/src/calibre/gui2/actions/help.py b/src/calibre/gui2/actions/help.py index 2294daf4bb..7d5851c83d 100644 --- a/src/calibre/gui2/actions/help.py +++ b/src/calibre/gui2/actions/help.py @@ -19,7 +19,7 @@ class HelpAction(InterfaceAction): self.qaction.triggered.connect(self.show_help) def show_help(self, *args): - open_url(QUrl('http://calibre-ebook.com/user_manual')) + open_url(QUrl('http://manual.calibre-ebook.com')) diff --git a/src/calibre/gui2/convert/font_key.ui b/src/calibre/gui2/convert/font_key.ui index 6c8ad2be01..07e0cb0f11 100644 --- a/src/calibre/gui2/convert/font_key.ui +++ b/src/calibre/gui2/convert/font_key.ui @@ -33,7 +33,7 @@ <p>This wizard will help you choose an appropriate font size key for your needs. Just enter the base font size of the input document and then enter an input font size. The wizard will display what font size it will be mapped to, by the font rescaling algorithm. You can adjust the algorithm by adjusting the output base font size and font key below. When you find values suitable for you, click OK.</p> <p>By default, if the output base font size is zero and/or no font size key is specified, calibre will use the values from the current Output Profile. </p> -<p>See the <a href="http://calibre-ebook.com/user_manual/conversion.html#font-size-rescaling">User Manual</a> for a discussion of how font size rescaling works.</p> +<p>See the <a href="http://manual.calibre-ebook.com/conversion.html#font-size-rescaling">User Manual</a> for a discussion of how font size rescaling works.</p> true diff --git a/src/calibre/gui2/convert/heuristics.ui b/src/calibre/gui2/convert/heuristics.ui index 46d62061af..403321494a 100644 --- a/src/calibre/gui2/convert/heuristics.ui +++ b/src/calibre/gui2/convert/heuristics.ui @@ -17,7 +17,7 @@ - <b>Heuristic processing</b> means that calibre will scan your book for common patterns and fix them. As the name implies, this involves guesswork, which means that it could end up worsening the result of a conversion, if calibre guesses wrong. Therefore, it is disabled by default. Often, if a conversion does not turn out as you expect, turning on heuristics can improve matters. Read more about the various heuristic processing options in the <a href="http://calibre-ebook.com/user_manual/conversion.html#heuristic-processing">User Manual</a>. + <b>Heuristic processing</b> means that calibre will scan your book for common patterns and fix them. As the name implies, this involves guesswork, which means that it could end up worsening the result of a conversion, if calibre guesses wrong. Therefore, it is disabled by default. Often, if a conversion does not turn out as you expect, turning on heuristics can improve matters. Read more about the various heuristic processing options in the <a href="http://manual.calibre-ebook.com/conversion.html#heuristic-processing">User Manual</a>. true diff --git a/src/calibre/gui2/convert/search_and_replace.ui b/src/calibre/gui2/convert/search_and_replace.ui index b7447f8feb..03a74b5ebd 100644 --- a/src/calibre/gui2/convert/search_and_replace.ui +++ b/src/calibre/gui2/convert/search_and_replace.ui @@ -188,7 +188,7 @@ - <p>Search and replace uses <i>regular expressions</i>. See the <a href="http://calibre-ebook.com/user_manual/regexp.html">regular expressions tutorial</a> to get started with regular expressions. Also clicking the wizard buttons below will allow you to test your regular expression against the current input document. + <p>Search and replace uses <i>regular expressions</i>. See the <a href="http://manual.calibre-ebook.com/regexp.html">regular expressions tutorial</a> to get started with regular expressions. Also clicking the wizard buttons below will allow you to test your regular expression against the current input document. true diff --git a/src/calibre/gui2/convert/xpath_wizard.ui b/src/calibre/gui2/convert/xpath_wizard.ui index 52985653fe..5e112e1fcd 100644 --- a/src/calibre/gui2/convert/xpath_wizard.ui +++ b/src/calibre/gui2/convert/xpath_wizard.ui @@ -127,7 +127,7 @@ - <p>For example, to match all h2 tags that have class="chapter", set tag to <i>h2</i>, attribute to <i>class</i> and value to <i>chapter</i>.</p><p>Leaving attribute blank will match any attribute and leaving value blank will match any value. Setting tag to * will match any tag.</p><p>To learn more advanced usage of XPath see the <a href="http://calibre-ebook.com/user_manual/xpath.html">XPath Tutorial</a>. + <p>For example, to match all h2 tags that have class="chapter", set tag to <i>h2</i>, attribute to <i>class</i> and value to <i>chapter</i>.</p><p>Leaving attribute blank will match any attribute and leaving value blank will match any value. Setting tag to * will match any tag.</p><p>To learn more advanced usage of XPath see the <a href="http://manual.calibre-ebook.com/xpath.html">XPath Tutorial</a>. true diff --git a/src/calibre/gui2/dialogs/search.ui b/src/calibre/gui2/dialogs/search.ui index eb6fffdb60..f3f96547bd 100644 --- a/src/calibre/gui2/dialogs/search.ui +++ b/src/calibre/gui2/dialogs/search.ui @@ -177,7 +177,7 @@ - See the <a href="http://calibre-ebook.com/user_manual/gui.html#the-search-interface">User Manual</a> for more help + See the <a href="http://manual.calibre-ebook.com/gui.html#the-search-interface">User Manual</a> for more help true diff --git a/src/calibre/gui2/dialogs/user_profiles.ui b/src/calibre/gui2/dialogs/user_profiles.ui index 7631c74768..6493846c2b 100644 --- a/src/calibre/gui2/dialogs/user_profiles.ui +++ b/src/calibre/gui2/dialogs/user_profiles.ui @@ -386,7 +386,7 @@ p, li { white-space: pre-wrap; } - For help with writing advanced news recipes, please visit <a href="http://__appname__-ebook.com/user_manual/news.html">User Recipes</a> + For help with writing advanced news recipes, please visit <a href="http://manual.__appname__-ebook.com/news.html">User Recipes</a> true diff --git a/src/calibre/gui2/filename_pattern.ui b/src/calibre/gui2/filename_pattern.ui index c8a9b4f6f6..b86db0fa75 100644 --- a/src/calibre/gui2/filename_pattern.ui +++ b/src/calibre/gui2/filename_pattern.ui @@ -19,7 +19,7 @@ <div style="font-size:10pt;"> <p>Set a regular expression pattern to use when trying to guess ebook metadata from filenames. </p> -<p>A <a href="http://calibre-ebook.com/user_manual/regexp.html">tutorial</a> on using regular expressions is available.</p> +<p>A <a href="http://manual.calibre-ebook.com/regexp.html">tutorial</a> on using regular expressions is available.</p> <p>Use the <b>Test</b> functionality below to test your regular expression on a few sample filenames (remember to include the file extension). The group names for the various metadata entries are documented in tooltips.</p></div> diff --git a/src/calibre/gui2/preferences/look_feel.py b/src/calibre/gui2/preferences/look_feel.py index 49bfb1df1a..b6e6de1902 100644 --- a/src/calibre/gui2/preferences/look_feel.py +++ b/src/calibre/gui2/preferences/look_feel.py @@ -164,7 +164,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): 'library view. Choose the column you wish to color, then ' 'supply a template that specifies the color to use based on ' 'the values in the column. There is a ' - '' + '' 'tutorial on using templates.') + '

' + _('If you want to color a field based on tags, then click the ' diff --git a/src/calibre/gui2/store/config/chooser/adv_search_builder.ui b/src/calibre/gui2/store/config/chooser/adv_search_builder.ui index 7d57321c72..f1c70e5066 100644 --- a/src/calibre/gui2/store/config/chooser/adv_search_builder.ui +++ b/src/calibre/gui2/store/config/chooser/adv_search_builder.ui @@ -149,7 +149,7 @@ - See the <a href="http://calibre-ebook.com/user_manual/gui.html#the-search-interface">User Manual</a> for more help + See the <a href="http://manual.calibre-ebook.com/gui.html#the-search-interface">User Manual</a> for more help true diff --git a/src/calibre/gui2/store/search/adv_search_builder.ui b/src/calibre/gui2/store/search/adv_search_builder.ui index a758057311..fd070ef2da 100644 --- a/src/calibre/gui2/store/search/adv_search_builder.ui +++ b/src/calibre/gui2/store/search/adv_search_builder.ui @@ -149,7 +149,7 @@ - See the <a href="http://calibre-ebook.com/user_manual/gui.html#the-search-interface">User Manual</a> for more help + See the <a href="http://manual.calibre-ebook.com/gui.html#the-search-interface">User Manual</a> for more help true diff --git a/src/calibre/gui2/wizard/finish.ui b/src/calibre/gui2/wizard/finish.ui index d637aa350a..28972d864e 100644 --- a/src/calibre/gui2/wizard/finish.ui +++ b/src/calibre/gui2/wizard/finish.ui @@ -62,7 +62,7 @@ - <h2>User Manual</h2>A User Manual is also available <a href="http://calibre-ebook.com/user_manual">online</a>. + <h2>User Manual</h2>A User Manual is also available <a href="http://manual.calibre-ebook.com">online</a>. true diff --git a/src/calibre/manual/conf.py b/src/calibre/manual/conf.py index d2b3a91d8d..79e9fdd832 100644 --- a/src/calibre/manual/conf.py +++ b/src/calibre/manual/conf.py @@ -86,11 +86,19 @@ pygments_style = 'sphinx' # given in html_static_path. html_theme = 'default' html_theme_options = {'stickysidebar':'true', 'relbarbgcolor':'black'} +# Put the quick search box on top +html_sidebars = { + '**' : ['searchbox.html', 'localtoc.html', 'relations.html', + 'sourcelink.html'], +} + +# The favicon +html_favicon = 'favicon.ico' # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, # so a file named "default.css" will overwrite the builtin "default.css". -html_static_path = ['resources'] +html_static_path = ['resources', '../../../icons/favicon.ico'] # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, # using the given strftime format. @@ -108,7 +116,7 @@ html_logo = 'resources/logo.png' epub_author = 'Kovid Goyal' epub_cover = 'epub_cover.jpg' epub_publisher = 'Kovid Goyal' -epub_identifier = 'http://calibre-ebook.com/user_manual' +epub_identifier = 'http://manual.calibre-ebook.com' epub_scheme = 'url' epub_uid = 'S54a88f8e9d42455e9c6db000e989225f' epub_tocdepth = 4 @@ -131,7 +139,7 @@ html_copy_source = True # Output file base name for HTML help builder. htmlhelp_basename = 'calibredoc' -html_use_opensearch = 'http://calibre-ebook.com/user_manual' +html_use_opensearch = 'http://manual.calibre-ebook.com' html_show_sphinx = False diff --git a/src/calibre/utils/help2man.py b/src/calibre/utils/help2man.py index 00989a168d..b079dc2314 100644 --- a/src/calibre/utils/help2man.py +++ b/src/calibre/utils/help2man.py @@ -52,7 +52,7 @@ def create_man_page(prog, parser): lines += ['.SH SEE ALSO', 'The User Manual is available at ' - 'http://calibre-ebook.com/user_manual', + 'http://manual.calibre-ebook.com', '.PP', '.B Created by '+__author__] lines = [x if isinstance(x, unicode) else unicode(x, 'utf-8', 'replace') for From 66315cead2b6f2ff0e0c60d890387b05867fb933 Mon Sep 17 00:00:00 2001 From: John Schember Date: Sat, 28 May 2011 16:14:57 -0400 Subject: [PATCH 22/47] Store: Make use of donate.png consistant with other images. --- .../store/config/chooser/chooser_widget.ui | 45 +++++++++++++++++++ src/calibre/gui2/store/search/models.py | 8 ++-- 2 files changed, 48 insertions(+), 5 deletions(-) diff --git a/src/calibre/gui2/store/config/chooser/chooser_widget.ui b/src/calibre/gui2/store/config/chooser/chooser_widget.ui index e833dbf4b9..4c2f136b62 100644 --- a/src/calibre/gui2/store/config/chooser/chooser_widget.ui +++ b/src/calibre/gui2/store/config/chooser/chooser_widget.ui @@ -80,6 +80,51 @@ + + + + + + Select: + + + + + + + All + + + + + + + None + + + + + + + Invert + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + diff --git a/src/calibre/gui2/store/search/models.py b/src/calibre/gui2/store/search/models.py index 25d30e3385..9b2966d0eb 100644 --- a/src/calibre/gui2/store/search/models.py +++ b/src/calibre/gui2/store/search/models.py @@ -45,6 +45,8 @@ class Matches(QAbstractItemModel): Qt.SmoothTransformation) self.DRM_UNKNOWN_ICON = QPixmap(I('dialog_question.png')).scaledToHeight(64, Qt.SmoothTransformation) + self.DONATE_ICON = QPixmap(I('donate.png')).scaledToHeight(16, + Qt.SmoothTransformation) # All matches. Used to determine the order to display # self.matches because the SearchFilter returns @@ -180,11 +182,7 @@ class Matches(QAbstractItemModel): return QVariant(self.DRM_UNKNOWN_ICON) if col == 5: if result.affiliate: - # For some reason the size(16, 16) is forgotten if the icon - # is a class attribute. Don't know why... - icon = QIcon() - icon.addFile(I('donate.png'), QSize(16, 16)) - return QVariant(icon) + return QVariant(self.DONATE_ICON) return NONE elif role == Qt.ToolTipRole: if col == 1: From a46954edf9675139ff26b5724e8c031be2eeed94 Mon Sep 17 00:00:00 2001 From: John Schember Date: Sat, 28 May 2011 16:55:57 -0400 Subject: [PATCH 23/47] Store: Advance search for affiliate. Clean up tool tips. Add quick enable buttons in chooser. Add affiliate status in chooser. --- .../config/chooser/adv_search_builder.py | 8 ++- .../config/chooser/adv_search_builder.ui | 30 ++++++++++- .../store/config/chooser/chooser_widget.py | 3 ++ .../store/config/chooser/chooser_widget.ui | 8 +-- .../gui2/store/config/chooser/models.py | 52 ++++++++++++++----- .../gui2/store/search/adv_search_builder.py | 6 ++- .../gui2/store/search/adv_search_builder.ui | 30 ++++++++++- .../gui2/store/search/download_thread.py | 1 + src/calibre/gui2/store/search/models.py | 2 +- src/calibre/gui2/store/search/search.py | 2 +- src/calibre/gui2/store/search_result.py | 1 + 11 files changed, 118 insertions(+), 25 deletions(-) diff --git a/src/calibre/gui2/store/config/chooser/adv_search_builder.py b/src/calibre/gui2/store/config/chooser/adv_search_builder.py index 7b519abcd1..d22554b111 100644 --- a/src/calibre/gui2/store/config/chooser/adv_search_builder.py +++ b/src/calibre/gui2/store/config/chooser/adv_search_builder.py @@ -45,8 +45,9 @@ class AdvSearchBuilderDialog(QDialog, Ui_Dialog): self.description_box.setText('') self.headquarters_box.setText('') self.format_box.setText('') - self.enabled_combo.setIndex(0) - self.drm_combo.setIndex(0) + self.enabled_combo.setCurrentIndex(0) + self.drm_combo.setCurrentIndex(0) + self.affiliate_combo.setCurrentIndex(0) def tokens(self, raw): phrases = re.findall(r'\s*".*?"\s*', raw) @@ -126,6 +127,9 @@ class AdvSearchBuilderDialog(QDialog, Ui_Dialog): drm = unicode(self.drm_combo.currentText()).strip() if drm: ans.append('drm:' + drm) + affiliate = unicode(self.affiliate_combo.currentText()).strip() + if affiliate: + ans.append('affiliate:' + affiliate) if ans: return ' and '.join(ans) return '' diff --git a/src/calibre/gui2/store/config/chooser/adv_search_builder.ui b/src/calibre/gui2/store/config/chooser/adv_search_builder.ui index 7d57321c72..3ace8ef04e 100644 --- a/src/calibre/gui2/store/config/chooser/adv_search_builder.ui +++ b/src/calibre/gui2/store/config/chooser/adv_search_builder.ui @@ -226,7 +226,7 @@ - + @@ -244,7 +244,7 @@ - + Qt::Vertical @@ -335,6 +335,32 @@ + + + + Affiliate: + + + + + + + + + + + + + true + + + + + false + + + + diff --git a/src/calibre/gui2/store/config/chooser/chooser_widget.py b/src/calibre/gui2/store/config/chooser/chooser_widget.py index 2f8c72d3d0..cc1db488f1 100644 --- a/src/calibre/gui2/store/config/chooser/chooser_widget.py +++ b/src/calibre/gui2/store/config/chooser/chooser_widget.py @@ -23,6 +23,9 @@ class StoreChooserWidget(QWidget, Ui_Form): self.search.clicked.connect(self.do_search) self.adv_search_builder.clicked.connect(self.build_adv_search) + self.enable_all.clicked.connect(self.results_view.model().enable_all) + self.enable_none.clicked.connect(self.results_view.model().enable_none) + self.enable_invert.clicked.connect(self.results_view.model().enable_invert) self.results_view.activated.connect(self.toggle_plugin) def do_search(self): diff --git a/src/calibre/gui2/store/config/chooser/chooser_widget.ui b/src/calibre/gui2/store/config/chooser/chooser_widget.ui index 4c2f136b62..7513cdd752 100644 --- a/src/calibre/gui2/store/config/chooser/chooser_widget.ui +++ b/src/calibre/gui2/store/config/chooser/chooser_widget.ui @@ -85,26 +85,26 @@ - Select: + Enable - + All - + None - + Invert diff --git a/src/calibre/gui2/store/config/chooser/models.py b/src/calibre/gui2/store/config/chooser/models.py index 6c95d74ffc..dbda367fae 100644 --- a/src/calibre/gui2/store/config/chooser/models.py +++ b/src/calibre/gui2/store/config/chooser/models.py @@ -6,7 +6,7 @@ __license__ = 'GPL 3' __copyright__ = '2011, John Schember ' __docformat__ = 'restructuredtext en' -from PyQt4.Qt import (Qt, QAbstractItemModel, QIcon, QVariant, QModelIndex) +from PyQt4.Qt import (Qt, QAbstractItemModel, QIcon, QVariant, QModelIndex, QSize) from calibre.gui2 import NONE from calibre.customize.ui import is_disabled, disable_plugin, enable_plugin @@ -18,13 +18,15 @@ from calibre.utils.search_query_parser import SearchQueryParser class Matches(QAbstractItemModel): - HEADERS = [_('Enabled'), _('Name'), _('No DRM'), _('Headquarters'), _('Formats')] + HEADERS = [_('Enabled'), _('Name'), _('No DRM'), _('Headquarters'), _('Affiliate'), _('Formats')] HTML_COLS = [1] def __init__(self, plugins): QAbstractItemModel.__init__(self) self.NO_DRM_ICON = QIcon(I('ok.png')) + self.DONATE_ICON = QIcon() + self.DONATE_ICON.addFile(I('donate.png'), QSize(16, 16)) self.all_matches = plugins self.matches = plugins @@ -53,6 +55,22 @@ class Matches(QAbstractItemModel): self.layoutChanged.emit() self.sort(self.sort_col, self.sort_order) + def enable_all(self): + for i in xrange(len(self.matches)): + index = self.createIndex(i, 0) + data = QVariant(True) + self.setData(index, data, Qt.CheckStateRole) + + def enable_none(self): + for i in xrange(len(self.matches)): + index = self.createIndex(i, 0) + data = QVariant(False) + self.setData(index, data, Qt.CheckStateRole) + + def enable_invert(self): + for i in xrange(len(self.matches)): + self.toggle_plugin(self.createIndex(i, 0)) + def toggle_plugin(self, index): new_index = self.createIndex(index.row(), 0) data = QVariant(is_disabled(self.get_plugin(index))) @@ -91,12 +109,15 @@ class Matches(QAbstractItemModel): return QVariant('%s
%s' % (result.name, result.description)) elif col == 3: return QVariant(result.headquarters) - elif col == 4: + elif col == 5: return QVariant(', '.join(result.formats).upper()) elif role == Qt.DecorationRole: if col == 2: if result.drm_free_only: return QVariant(self.NO_DRM_ICON) + if col == 4: + if result.affiliate: + return QVariant(self.DONATE_ICON) elif role == Qt.CheckStateRole: if col == 0: if is_disabled(result): @@ -105,20 +126,23 @@ class Matches(QAbstractItemModel): elif role == Qt.ToolTipRole: if col == 0: if is_disabled(result): - return QVariant(_('

This store is currently diabled and cannot be used in other parts of calibre.

')) + return QVariant('

' + _('This store is currently diabled and cannot be used in other parts of calibre.') + '

') else: - return QVariant(_('

This store is currently enabled and can be used in other parts of calibre.

')) + return QVariant('

' + _('This store is currently enabled and can be used in other parts of calibre.') + '

') elif col == 1: return QVariant('

%s

' % result.description) elif col == 2: if result.drm_free_only: - return QVariant(_('

This store only distributes ebooks with DRM.

')) + return QVariant('

' + _('This store only distributes ebooks with DRM.') + '

') else: - return QVariant(_('

This store distributes ebooks with DRM. It may have some titles without DRM, but you will need to check on a per title basis.

')) + return QVariant('

' + _('This store distributes ebooks with DRM. It may have some titles without DRM, but you will need to check on a per title basis.') + '

') elif col == 3: - return QVariant(_('

This store is headquartered in %s. This is a good indication of what market the store caters to. However, this does not necessarily mean that the store is limited to that market only.

') % result.headquarters) + return QVariant('

' + _('This store is headquartered in %s. This is a good indication of what market the store caters to. However, this does not necessarily mean that the store is limited to that market only.') % result.headquarters + '

') elif col == 4: - return QVariant(_('

This store distributes ebooks in the following formats: %s

') % ', '.join(result.formats)) + if result.affiliate: + return QVariant('

' + _('Buying from this store supports the calibre developer: %s.') % result.author + '

') + elif col == 5: + return QVariant('

' + _('This store distributes ebooks in the following formats: %s') % ', '.join(result.formats) + '

') return NONE def setData(self, index, data, role): @@ -148,6 +172,8 @@ class Matches(QAbstractItemModel): text = 'a' if getattr(match, 'drm_free_only', True) else 'b' elif col == 3: text = getattr(match, 'headquarters', '') + elif col == 4: + text = 'a' if getattr(match, 'affiliate', False) else 'b' return text def sort(self, col, order, reset=True): @@ -167,6 +193,7 @@ class SearchFilter(SearchQueryParser): USABLE_LOCATIONS = [ 'all', + 'affiliate', 'description', 'drm', 'enabled', @@ -207,6 +234,7 @@ class SearchFilter(SearchQueryParser): all_locs = set(self.USABLE_LOCATIONS) - set(['all']) locations = all_locs if location == 'all' else [location] q = { + 'affiliate': lambda x: x.affiliate, 'description': lambda x: x.description.lower(), 'drm': lambda x: not x.drm_free_only, 'enabled': lambda x: not is_disabled(x), @@ -219,21 +247,21 @@ class SearchFilter(SearchQueryParser): for locvalue in locations: accessor = q[locvalue] if query == 'true': - if locvalue in ('drm', 'enabled'): + if locvalue in ('affiliate', 'drm', 'enabled'): if accessor(sr) == True: matches.add(sr) elif accessor(sr) is not None: matches.add(sr) continue if query == 'false': - if locvalue in ('drm', 'enabled'): + if locvalue in ('affiliate', 'drm', 'enabled'): if accessor(sr) == False: matches.add(sr) elif accessor(sr) is None: matches.add(sr) continue # this is bool, so can't match below - if locvalue in ('drm', 'enabled'): + if locvalue in ('affiliate', 'drm', 'enabled'): continue try: ### Can't separate authors because comma is used for name sep and author sep diff --git a/src/calibre/gui2/store/search/adv_search_builder.py b/src/calibre/gui2/store/search/adv_search_builder.py index 745e709f90..cc89ca4eb7 100644 --- a/src/calibre/gui2/store/search/adv_search_builder.py +++ b/src/calibre/gui2/store/search/adv_search_builder.py @@ -45,6 +45,7 @@ class AdvSearchBuilderDialog(QDialog, Ui_Dialog): self.author_box.setText('') self.price_box.setText('') self.format_box.setText('') + self.affiliate_combo.setCurrentIndex(0) def tokens(self, raw): phrases = re.findall(r'\s*".*?"\s*', raw) @@ -117,7 +118,10 @@ class AdvSearchBuilderDialog(QDialog, Ui_Dialog): ans.append('price:"' + self.mc + price + '"') format = unicode(self.format_box.text()).strip() if format: - ans.append('format:"' + self.mc + format + '"') + ans.append('format:"' + self.mc + format + '"') + affiliate = unicode(self.affiliate_combo.currentText()).strip() + if affiliate: + ans.append('affiliate:' + affiliate) if ans: return ' and '.join(ans) return '' diff --git a/src/calibre/gui2/store/search/adv_search_builder.ui b/src/calibre/gui2/store/search/adv_search_builder.ui index a758057311..e07c3d7d48 100644 --- a/src/calibre/gui2/store/search/adv_search_builder.ui +++ b/src/calibre/gui2/store/search/adv_search_builder.ui @@ -226,7 +226,7 @@ - + @@ -244,7 +244,7 @@ - + Qt::Vertical @@ -283,6 +283,32 @@ + + + + Affiliate: + + + + + + + + + + + + + true + + + + + false + + + + diff --git a/src/calibre/gui2/store/search/download_thread.py b/src/calibre/gui2/store/search/download_thread.py index 67b4224981..c55c487b5f 100644 --- a/src/calibre/gui2/store/search/download_thread.py +++ b/src/calibre/gui2/store/search/download_thread.py @@ -121,6 +121,7 @@ class SearchThread(Thread): return res.store_name = store_name res.affiliate = store_plugin.base_plugin.affiliate + res.plugin_author = store_plugin.base_plugin.author self.results.put((res, store_plugin)) self.tasks.task_done() except: diff --git a/src/calibre/gui2/store/search/models.py b/src/calibre/gui2/store/search/models.py index 9b2966d0eb..c922bb31d7 100644 --- a/src/calibre/gui2/store/search/models.py +++ b/src/calibre/gui2/store/search/models.py @@ -200,7 +200,7 @@ class Matches(QAbstractItemModel): return QVariant('

%s

' % result.formats) elif col == 5: if result.affiliate: - return QVariant(_('Buying from this store supports a calibre developer')) + return QVariant('

' + _('Buying from this store supports the calibre developer: %s.') % result.plugin_author + '

') elif role == Qt.SizeHintRole: return QSize(64, 64) return NONE diff --git a/src/calibre/gui2/store/search/search.py b/src/calibre/gui2/store/search/search.py index 7e69c61524..aa9aef6c3e 100644 --- a/src/calibre/gui2/store/search/search.py +++ b/src/calibre/gui2/store/search/search.py @@ -102,7 +102,7 @@ class SearchDialog(QDialog, Ui_Dialog): store_list_layout.addWidget(cbox, i, 0, 1, 1) if self.gui.istores[x].base_plugin.affiliate: iw = QLabel(self) - iw.setToolTip(_('Buying from this store supports a calibre developer')) + iw.setToolTip('

' + _('Buying from this store supports the calibre developer: %s

') % self.gui.istores[x].base_plugin.author + '

') iw.setPixmap(icon.pixmap(16, 16)) store_list_layout.addWidget(iw, i, 1, 1, 1) self.store_checks[x] = cbox diff --git a/src/calibre/gui2/store/search_result.py b/src/calibre/gui2/store/search_result.py index 83a2c8601d..7d6ac5acad 100644 --- a/src/calibre/gui2/store/search_result.py +++ b/src/calibre/gui2/store/search_result.py @@ -23,6 +23,7 @@ class SearchResult(object): self.drm = None self.formats = '' self.affiliate = False + self.plugin_author = '' def __eq__(self, other): return self.title == other.title and self.author == other.author and self.store_name == other.store_name From 97774c0f932f1c4d59512e2f1cdbf5ff8ef5d999 Mon Sep 17 00:00:00 2001 From: John Schember Date: Sat, 28 May 2011 16:56:58 -0400 Subject: [PATCH 24/47] ... --- src/calibre/gui2/store/search/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/gui2/store/search/models.py b/src/calibre/gui2/store/search/models.py index c922bb31d7..89c11445b3 100644 --- a/src/calibre/gui2/store/search/models.py +++ b/src/calibre/gui2/store/search/models.py @@ -10,7 +10,7 @@ import re from operator import attrgetter from PyQt4.Qt import (Qt, QAbstractItemModel, QVariant, QPixmap, QModelIndex, QSize, - pyqtSignal, QIcon) + pyqtSignal) from calibre.gui2 import NONE, FunctionDispatcher from calibre.gui2.store.search_result import SearchResult From 7a674192167d7458e363c5a1c496f3954b64451f Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 28 May 2011 15:00:02 -0600 Subject: [PATCH 25/47] ... --- src/calibre/manual/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/manual/conf.py b/src/calibre/manual/conf.py index 79e9fdd832..91a4395007 100644 --- a/src/calibre/manual/conf.py +++ b/src/calibre/manual/conf.py @@ -43,7 +43,7 @@ language = 'en' # General substitutions. project = __appname__ -copyright = '2008, Kovid Goyal' +copyright = 'Kovid Goyal' # The default replacements for |version| and |release|, also used in various # other places throughout the built documents. From b19ebf917aca06a87f8d85689a7d47f4e9214b0a Mon Sep 17 00:00:00 2001 From: John Schember Date: Sat, 28 May 2011 20:29:40 -0400 Subject: [PATCH 26/47] Store: Chooser allow user to configure plugins via right clicking. --- .../gui2/store/config/chooser/results_view.py | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/calibre/gui2/store/config/chooser/results_view.py b/src/calibre/gui2/store/config/chooser/results_view.py index 1c18a18d7b..10dff4bcdb 100644 --- a/src/calibre/gui2/store/config/chooser/results_view.py +++ b/src/calibre/gui2/store/config/chooser/results_view.py @@ -6,7 +6,9 @@ __license__ = 'GPL 3' __copyright__ = '2011, John Schember ' __docformat__ = 'restructuredtext en' -from PyQt4.Qt import (Qt, QTreeView, QSize) +from functools import partial + +from PyQt4.Qt import (Qt, QTreeView, QSize, QMenu) from calibre.customize.ui import store_plugins from calibre.gui2.metadata.single_download import RichTextDelegate @@ -32,3 +34,20 @@ class ResultsView(QTreeView): self.model().sort(1, Qt.AscendingOrder) self.header().setSortIndicator(self.model().sort_col, self.model().sort_order) + + def contextMenuEvent(self, event): + index = self.indexAt(event.pos()) + + if not index.isValid(): + return + + plugin = self.model().get_plugin(index) + + menu = QMenu() + ca = menu.addAction(_('Configure...'), partial(self.configure_plugin, plugin)) + if not plugin.is_customizable(): + ca.setEnabled(False) + menu.exec_(event.globalPos()) + + def configure_plugin(self, plugin): + plugin.do_user_config(self) From 8135b12f2d05435b6bb19d671267569f7dd55e41 Mon Sep 17 00:00:00 2001 From: John Schember Date: Sat, 28 May 2011 20:38:41 -0400 Subject: [PATCH 27/47] Store: search, config dialog save size and current tab. Set better default size. --- src/calibre/gui2/store/search/search.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/calibre/gui2/store/search/search.py b/src/calibre/gui2/store/search/search.py index aa9aef6c3e..cda89f278e 100644 --- a/src/calibre/gui2/store/search/search.py +++ b/src/calibre/gui2/store/search/search.py @@ -268,7 +268,22 @@ class SearchDialog(QDialog, Ui_Dialog): tab_widget.addTab(chooser_config_widget, _('Choose stores')) tab_widget.addTab(search_config_widget, _('Configure search')) + # Restore dialog state. + geometry = self.config.get('config_dialog_geometry', None) + if geometry: + d.restoreGeometry(geometry) + else: + d.resize(800, 600) + tab_index = self.config.get('config_dialog_tab_index', 0) + tab_index = min(tab_index, tab_widget.count() - 1) + tab_widget.setCurrentIndex(tab_index) + d.exec_() + + # Save dialog state. + self.config['config_dialog_geometry'] = bytearray(d.saveGeometry()) + self.config['config_dialog_tab_index'] = tab_widget.currentIndex() + search_config_widget.save_settings() self.config_changed() self.gui.load_store_plugins() From 45e2298080b2b0ddb3a516b111467b09641ebe49 Mon Sep 17 00:00:00 2001 From: John Schember Date: Sat, 28 May 2011 20:43:34 -0400 Subject: [PATCH 28/47] Store: Remove unnecessary code. --- src/calibre/gui2/store/config/chooser/chooser_widget.py | 5 +---- src/calibre/gui2/store/search/search.py | 2 ++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/calibre/gui2/store/config/chooser/chooser_widget.py b/src/calibre/gui2/store/config/chooser/chooser_widget.py index cc1db488f1..a9399028f8 100644 --- a/src/calibre/gui2/store/config/chooser/chooser_widget.py +++ b/src/calibre/gui2/store/config/chooser/chooser_widget.py @@ -26,14 +26,11 @@ class StoreChooserWidget(QWidget, Ui_Form): self.enable_all.clicked.connect(self.results_view.model().enable_all) self.enable_none.clicked.connect(self.results_view.model().enable_none) self.enable_invert.clicked.connect(self.results_view.model().enable_invert) - self.results_view.activated.connect(self.toggle_plugin) + self.results_view.activated.connect(self.results_view.model().toggle_plugin) def do_search(self): self.results_view.model().search(unicode(self.query.text())) - def toggle_plugin(self, index): - self.results_view.model().toggle_plugin(index) - def build_adv_search(self): adv = AdvSearchBuilderDialog(self) if adv.exec_() == QDialog.Accepted: diff --git a/src/calibre/gui2/store/search/search.py b/src/calibre/gui2/store/search/search.py index cda89f278e..e1ad24943d 100644 --- a/src/calibre/gui2/store/search/search.py +++ b/src/calibre/gui2/store/search/search.py @@ -251,6 +251,8 @@ class SearchDialog(QDialog, Ui_Dialog): # search widget. self.config['open_external'] = self.open_external.isChecked() + # Create the config dialog. It's going to put two config widgets + # into a QTabWidget for displaying all of the settings. d = QDialog(self) button_box = QDialogButtonBox(QDialogButtonBox.Close) v = QVBoxLayout(d) From 549c65a55752dea1bfd0bda34844cda472a8979d Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 28 May 2011 23:24:58 -0600 Subject: [PATCH 29/47] Change update message so that I stop getting annoyed by people that can't seem to understand that there is no compulsion to update. --- src/calibre/gui2/update.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/calibre/gui2/update.py b/src/calibre/gui2/update.py index 9929d50a7e..847b5785e9 100644 --- a/src/calibre/gui2/update.py +++ b/src/calibre/gui2/update.py @@ -52,7 +52,8 @@ class UpdateNotification(QDialog): self.label = QLabel('

'+ _('%s has been updated to version %s. ' 'See the new features.')%(__appname__, version)) + '">new features. Only update if one of the ' + 'new features or bug fixes is important to you.')%(__appname__, version)) self.label.setOpenExternalLinks(True) self.label.setWordWrap(True) self.setWindowTitle(_('Update available!')) From 456b6b423eab32be26a8aba637d5ee57fa16ae33 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 29 May 2011 00:31:14 -0600 Subject: [PATCH 30/47] ... --- src/calibre/manual/develop.rst | 2 +- src/calibre/manual/faq.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/calibre/manual/develop.rst b/src/calibre/manual/develop.rst index f95d51bfca..c49176ceb2 100644 --- a/src/calibre/manual/develop.rst +++ b/src/calibre/manual/develop.rst @@ -65,7 +65,7 @@ this, make your changes, then run:: bzr send -o my-changes This will create a :file:`my-changes` file in the current directory, -simply attach that to a ticket on the |app| `bug tracker `_. +simply attach that to a ticket on the |app| `bug tracker `_. If you plan to do a lot of development on |app|, then the best method is to create a `Launchpad `_ account. Once you have the account, you can use it to register diff --git a/src/calibre/manual/faq.rst b/src/calibre/manual/faq.rst index 1c0b49f30b..99c53e5a37 100644 --- a/src/calibre/manual/faq.rst +++ b/src/calibre/manual/faq.rst @@ -560,7 +560,7 @@ I want some feature added to |app|. What can I do? ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ You have two choices: 1. Create a patch by hacking on |app| and send it to me for review and inclusion. See `Development `_. - 2. `Open a ticket `_ (you have to register and login first). Remember that |app| development is done by volunteers, so if you get no response to your feature request, it means no one feels like implementing it. + 2. `Open a ticket `_ (you have to register and login first). Remember that |app| development is done by volunteers, so if you get no response to your feature request, it means no one feels like implementing it. How is |app| licensed? ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ From 6c26b9debc72060cfc10f1239d96311c1691ed08 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sun, 29 May 2011 10:04:34 +0100 Subject: [PATCH 31/47] Add the ondevice() function to the template language --- src/calibre/library/database2.py | 1 + src/calibre/manual/template_lang.rst | 3 ++- src/calibre/utils/formatter_functions.py | 18 +++++++++++++++++- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py index 819ac2cd24..df465c919e 100644 --- a/src/calibre/library/database2.py +++ b/src/calibre/library/database2.py @@ -860,6 +860,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): mi.uuid = row[fm['uuid']] mi.title_sort = row[fm['sort']] mi.book_size = row[fm['size']] + mi.ondevice_col= row[fm['ondevice']] mi.last_modified = row[fm['last_modified']] formats = row[fm['formats']] if not formats: diff --git a/src/calibre/manual/template_lang.rst b/src/calibre/manual/template_lang.rst index 059376565d..28c9855ce4 100644 --- a/src/calibre/manual/template_lang.rst +++ b/src/calibre/manual/template_lang.rst @@ -255,6 +255,7 @@ The following functions are available in addition to those described in single-f * ``not(value)`` -- returns the string "1" if the value is empty, otherwise returns the empty string. This function works well with test or first_non_empty. You can have as many values as you want. * ``merge_lists(list1, list2, separator)`` -- return a list made by merging the items in list1 and list2, removing duplicate items using a case-insensitive compare. If items differ in case, the one in list1 is used. The items in list1 and list2 are separated by separator, as are the items in the returned list. * ``multiply(x, y)`` -- returns x * y. Throws an exception if either x or y are not numbers. + * ``ondevice()`` -- return the string "Yes" if ondevice is set, otherwise return the empty string * ``or(value, value, ...)`` -- returns the string "1" if any value is not empty, otherwise returns the empty string. This function works well with test or first_non_empty. You can have as many values as you want. * ``print(a, b, ...)`` -- prints the arguments to standard output. Unless you start calibre from the command line (``calibre-debug -g``), the output will go to a black hole. * ``raw_field(name)`` -- returns the metadata field named by name without applying any formatting. @@ -277,7 +278,7 @@ Function classification summary: * Relational: ``cmp`` , ``strcmp`` for strings * String case changes: ``lowercase``, ``uppercase``, ``titlecase``, ``capitalize`` * String manipulation: ``re``, ``shorten``, ``substr`` - * Other: ``assign``, ``booksize``, ``print``, ``format_date``, + * Other: ``assign``, ``booksize``, ``format_date``, ``ondevice`` ``print`` .. _general_mode: diff --git a/src/calibre/utils/formatter_functions.py b/src/calibre/utils/formatter_functions.py index 2f15d5d592..761da2c8e2 100644 --- a/src/calibre/utils/formatter_functions.py +++ b/src/calibre/utils/formatter_functions.py @@ -568,7 +568,7 @@ class BuiltinCapitalize(BuiltinFormatterFunction): class BuiltinBooksize(BuiltinFormatterFunction): name = 'booksize' arg_count = 0 - doc = _('booksize() -- return value of the field capitalized') + doc = _('booksize() -- return value of the size field') def evaluate(self, formatter, kwargs, mi, locals): if mi.book_size is not None: @@ -578,6 +578,21 @@ class BuiltinBooksize(BuiltinFormatterFunction): pass return '' +class BuiltinOndevice(BuiltinFormatterFunction): + name = 'ondevice' + arg_count = 0 + doc = _('ondevice() -- return Yes if ondevice is set, otherwise return ' + 'the empty string') + + def evaluate(self, formatter, kwargs, mi, locals): + print mi.ondevice_col + if mi.ondevice_col: + try: + return _('Yes') + except: + pass + return '' + class BuiltinFirstNonEmpty(BuiltinFormatterFunction): name = 'first_non_empty' arg_count = -1 @@ -687,6 +702,7 @@ builtin_lowercase = BuiltinLowercase() builtin_merge_lists = BuiltinMergeLists() builtin_multiply = BuiltinMultiply() builtin_not = BuiltinNot() +builtin_ondevice = BuiltinOndevice() builtin_or = BuiltinOr() builtin_print = BuiltinPrint() builtin_raw_field = BuiltinRaw_field() From faffa55cf1299cc1beaf257f0aea765db2d37fb5 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sun, 29 May 2011 10:05:47 +0100 Subject: [PATCH 32/47] take out print statement --- src/calibre/utils/formatter_functions.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/calibre/utils/formatter_functions.py b/src/calibre/utils/formatter_functions.py index 761da2c8e2..bf597d5b9c 100644 --- a/src/calibre/utils/formatter_functions.py +++ b/src/calibre/utils/formatter_functions.py @@ -585,7 +585,6 @@ class BuiltinOndevice(BuiltinFormatterFunction): 'the empty string') def evaluate(self, formatter, kwargs, mi, locals): - print mi.ondevice_col if mi.ondevice_col: try: return _('Yes') From 393cfe78cdca8f96b4e85d40e612087af86076f0 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sun, 29 May 2011 11:30:04 +0100 Subject: [PATCH 33/47] Improvements to editing templates and formatter exception reporting. Largest improvement is adding a value preview box to the template editor. --- src/calibre/ebooks/metadata/book/base.py | 39 +++++++-------- src/calibre/gui2/dialogs/template_dialog.py | 10 +++- src/calibre/gui2/dialogs/template_dialog.ui | 50 +++++++++++++------ .../gui2/dialogs/template_line_editor.py | 6 ++- src/calibre/gui2/library/delegates.py | 3 +- src/calibre/gui2/preferences/look_feel.py | 10 ++++ src/calibre/utils/formatter.py | 9 ++-- src/calibre/utils/formatter_functions.py | 21 +++----- 8 files changed, 92 insertions(+), 56 deletions(-) diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py index 5dc3f25dfb..179a96e578 100644 --- a/src/calibre/ebooks/metadata/book/base.py +++ b/src/calibre/ebooks/metadata/book/base.py @@ -41,27 +41,24 @@ field_metadata = FieldMetadata() class SafeFormat(TemplateFormatter): - def get_value(self, key, args, kwargs): - try: - key = key.lower() - if key != 'title_sort' and key not in TOP_LEVEL_IDENTIFIERS: - key = field_metadata.search_term_to_field_key(key) - b = self.book.get_user_metadata(key, False) - if b and b['datatype'] == 'int' and self.book.get(key, 0) == 0: - v = '' - elif b and b['datatype'] == 'float' and self.book.get(key, 0.0) == 0.0: - v = '' - else: - v = self.book.format_field(key, series_with_index=False)[1] - if v is None: - return '' - if v == '': - return '' - return v - except: - if DEBUG: - traceback.print_exc() - return key + def get_value(self, orig_key, args, kwargs): + key = orig_key.lower() + if key != 'title_sort' and key not in TOP_LEVEL_IDENTIFIERS: + key = field_metadata.search_term_to_field_key(key) + if key is None or key not in self.book.all_field_keys(): + raise ValueError(_('Value: unknown field ') + orig_key) + b = self.book.get_user_metadata(key, False) + if b and b['datatype'] == 'int' and self.book.get(key, 0) == 0: + v = '' + elif b and b['datatype'] == 'float' and self.book.get(key, 0.0) == 0.0: + v = '' + else: + v = self.book.format_field(key, series_with_index=False)[1] + if v is None: + return '' + if v == '': + return '' + return v composite_formatter = SafeFormat() diff --git a/src/calibre/gui2/dialogs/template_dialog.py b/src/calibre/gui2/dialogs/template_dialog.py index ca55bb0e66..083dacbf00 100644 --- a/src/calibre/gui2/dialogs/template_dialog.py +++ b/src/calibre/gui2/dialogs/template_dialog.py @@ -11,6 +11,7 @@ from PyQt4.Qt import (Qt, QDialog, QDialogButtonBox, QSyntaxHighlighter, from calibre.gui2.dialogs.template_dialog_ui import Ui_TemplateDialog from calibre.utils.formatter_functions import formatter_functions +from calibre.ebooks.metadata.book.base import composite_formatter class ParenPosition: @@ -194,10 +195,13 @@ class TemplateHighlighter(QSyntaxHighlighter): class TemplateDialog(QDialog, Ui_TemplateDialog): - def __init__(self, parent, text): + def __init__(self, parent, text, mi): QDialog.__init__(self, parent) Ui_TemplateDialog.__init__(self) self.setupUi(self) + + self.mi = mi + # Remove help icon on title bar icon = self.windowIcon() self.setWindowFlags(self.windowFlags()&(~Qt.WindowContextHelpButtonHint)) @@ -233,12 +237,16 @@ class TemplateDialog(QDialog, Ui_TemplateDialog): self.function.addItems(func_names) self.function.setCurrentIndex(0) self.function.currentIndexChanged[str].connect(self.function_changed) + self.textbox_changed() def textbox_changed(self): cur_text = unicode(self.textbox.toPlainText()) if self.last_text != cur_text: self.last_text = cur_text self.highlighter.regenerate_paren_positions() + self.template_value.setText( + composite_formatter.safe_format(cur_text, self.mi, + _('EXCEPTION: '), self.mi)) def text_cursor_changed(self): cursor = self.textbox.textCursor() diff --git a/src/calibre/gui2/dialogs/template_dialog.ui b/src/calibre/gui2/dialogs/template_dialog.ui index dd8fb7bd88..d36cbbd3d4 100644 --- a/src/calibre/gui2/dialogs/template_dialog.ui +++ b/src/calibre/gui2/dialogs/template_dialog.ui @@ -23,19 +23,39 @@ - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - + + + Template value: + + + template_value + + + The value the of the template using the current book in the library view + + + + + + + true + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + Function &name: @@ -45,10 +65,10 @@ - + - + &Documentation: @@ -61,7 +81,7 @@ - + Python &code: @@ -74,7 +94,7 @@ - + @@ -84,7 +104,7 @@ - + diff --git a/src/calibre/gui2/dialogs/template_line_editor.py b/src/calibre/gui2/dialogs/template_line_editor.py index 98b74b391d..a724b5b072 100644 --- a/src/calibre/gui2/dialogs/template_line_editor.py +++ b/src/calibre/gui2/dialogs/template_line_editor.py @@ -21,6 +21,10 @@ class TemplateLineEditor(QLineEdit): def __init__(self, parent): QLineEdit.__init__(self, parent) self.tags = None + self.mi = None + + def set_mi(self, mi): + self.mi = mi def set_tags(self, tags): self.tags = tags @@ -37,7 +41,7 @@ class TemplateLineEditor(QLineEdit): menu.exec_(event.globalPos()) def open_editor(self): - t = TemplateDialog(self, self.text()) + t = TemplateDialog(self, self.text(), self.mi) t.setWindowTitle(_('Edit template')) if t.exec_(): self.setText(t.textbox.toPlainText()) diff --git a/src/calibre/gui2/library/delegates.py b/src/calibre/gui2/library/delegates.py index 6990a76b21..94c3deb403 100644 --- a/src/calibre/gui2/library/delegates.py +++ b/src/calibre/gui2/library/delegates.py @@ -418,8 +418,9 @@ class CcTemplateDelegate(QStyledItemDelegate): # {{{ def createEditor(self, parent, option, index): m = index.model() + mi = m.db.get_metadata(index.row(), index_is_id=False) text = m.custom_columns[m.column_map[index.column()]]['display']['composite_template'] - editor = TemplateDialog(parent, text) + editor = TemplateDialog(parent, text, mi) editor.setWindowTitle(_("Edit template")) editor.textbox.setTabChangesFocus(False) editor.textbox.setTabStopWidth(20) diff --git a/src/calibre/gui2/preferences/look_feel.py b/src/calibre/gui2/preferences/look_feel.py index b6e6de1902..fcdd56fd5f 100644 --- a/src/calibre/gui2/preferences/look_feel.py +++ b/src/calibre/gui2/preferences/look_feel.py @@ -205,11 +205,21 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): choices.insert(0, '') self.column_color_count = db.column_color_count+1 tags = db.all_tags() + + mi=None + try: + idx = gui.library_view.currentIndex().row() + if idx: + mi = db.get_metadata(idx, index_is_id=False) + except: + pass + for i in range(1, self.column_color_count): r('column_color_name_'+str(i), db.prefs, choices=choices) r('column_color_template_'+str(i), db.prefs) tpl = getattr(self, 'opt_column_color_template_'+str(i)) tpl.set_tags(tags) + tpl.set_mi(mi) toolbutton = getattr(self, 'opt_column_color_wizard_'+str(i)) toolbutton.clicked.connect(tpl.tag_wizard) all_colors = [unicode(s) for s in list(QColor.colorNames())] diff --git a/src/calibre/utils/formatter.py b/src/calibre/utils/formatter.py index fccd0015c1..695355330e 100644 --- a/src/calibre/utils/formatter.py +++ b/src/calibre/utils/formatter.py @@ -98,7 +98,10 @@ class _Parser(object): cls = funcs['assign'] return cls.eval_(self.parent, self.parent.kwargs, self.parent.book, self.parent.locals, id, self.expr()) - return self.parent.locals.get(id, _('unknown id ') + id) + val = self.parent.locals.get(id, None) + if val is None: + self.error(_('Unknown identifier ') + id) + return val # We have a function. # Check if it is a known one. We do this here so error reporting is # better, as it can identify the tokens near the problem. @@ -317,8 +320,8 @@ class TemplateFormatter(string.Formatter): try: ans = self.vformat(fmt, [], kwargs).strip() except Exception as e: - if DEBUG: - traceback.print_exc() +# if DEBUG: +# traceback.print_exc() ans = error_value + ' ' + e.message return ans diff --git a/src/calibre/utils/formatter_functions.py b/src/calibre/utils/formatter_functions.py index bf597d5b9c..d7b6e63f5e 100644 --- a/src/calibre/utils/formatter_functions.py +++ b/src/calibre/utils/formatter_functions.py @@ -63,20 +63,13 @@ class FormatterFunction(object): raise NotImplementedError() def eval_(self, formatter, kwargs, mi, locals, *args): - try: - ret = self.evaluate(formatter, kwargs, mi, locals, *args) - if isinstance(ret, (str, unicode)): - return ret - if isinstance(ret, (int, float, bool)): - return unicode(ret) - if isinstance(ret, list): - return ','.join(list) - except: - traceback.print_exc() - exc_type, exc_value, exc_traceback = sys.exc_info() - info = ': '.join(traceback.format_exception(exc_type, exc_value, - exc_traceback)[-2:]).replace('\n', '') - return _('Exception ') + info + ret = self.evaluate(formatter, kwargs, mi, locals, *args) + if isinstance(ret, (str, unicode)): + return ret + if isinstance(ret, (int, float, bool)): + return unicode(ret) + if isinstance(ret, list): + return ','.join(list) all_builtin_functions = [] class BuiltinFormatterFunction(FormatterFunction): From 52da86dbb6fa48d61ea852436082b6c7b8607e82 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sun, 29 May 2011 13:17:07 +0100 Subject: [PATCH 34/47] Added an else box to the tag color wizard. Also added more extensive tooltips. --- .../gui2/dialogs/template_line_editor.py | 61 ++++++++++++++++--- 1 file changed, 53 insertions(+), 8 deletions(-) diff --git a/src/calibre/gui2/dialogs/template_line_editor.py b/src/calibre/gui2/dialogs/template_line_editor.py index a724b5b072..d466cecc55 100644 --- a/src/calibre/gui2/dialogs/template_line_editor.py +++ b/src/calibre/gui2/dialogs/template_line_editor.py @@ -69,10 +69,38 @@ class TagWizard(QDialog): self.setLayout(l) l.setColumnStretch(0, 1) l.setColumnMinimumWidth(0, 300) - l.addWidget(QLabel(_('Tags (more than one per box permitted)')), 0, 0, 1, 1) - l.addWidget(QLabel(_('Color')), 0, 1, 1, 1) + h = QLabel(_('Tags (see the popup help for more information)')) + h.setToolTip('

' + + _('You can enter more than one tag per box, separated by commas. ' + 'The comparison ignores letter case.
' + 'A tag value can be a regular expression. ' + 'When using regular expressions, note that the wizard ' + 'puts anchors (^ and $) around the expression, so you ' + 'must ensure your expression matches from the beginning ' + 'to the end of the tag.
' + 'Regular expression examples:') + '

    ' + + _('
  • .* matches any tag. No empty tags are ' + 'checked, so you don\'t need to worry about empty strings
    • ' + '
  • A.* matches any tag beginning with A
    • ' + '
  • .*mystery.* matches any tag containing ' + 'the word "mystery"
    • ') + '

') + l.addWidget(h , 0, 0, 1, 1) + c = QLabel(_('Color if tag found')) + c.setToolTip('

' + + _('At least one of the two color boxes must have a value. Leave ' + 'one color box empty if you want the template to use the next ' + 'line in this wizard. If both boxes are filled in, the rest of ' + 'the lines in this wizard will be ignored.') + '

') + l.addWidget(c, 0, 1, 1, 1) + c = QLabel(_('Color if tag not found')) + c.setToolTip('

' + + _('This box is usually filled in only on the last test. If it is ' + 'filled in before the last test, then the color for tag found box ' + 'must be empty or all the rest of the tests will be ignored.') + '

') + l.addWidget(c, 0, 2, 1, 1) self.tagboxes = [] self.colorboxes = [] + self.nfcolorboxes = [] self.colors = [unicode(s) for s in list(QColor.colorNames())] self.colors.insert(0, '') for i in range(0, 10): @@ -85,15 +113,25 @@ class TagWizard(QDialog): cb.addItems(self.colors) self.colorboxes.append(cb) l.addWidget(cb, i+1, 1, 1, 1) + cb = QComboBox(self) + cb.addItems(self.colors) + self.nfcolorboxes.append(cb) + l.addWidget(cb, i+1, 2, 1, 1) if txt: lines = txt.split('\n')[3:] i = 0 for line in lines: if line.startswith('#'): - t,c = line[1:].split(':|:') + vals = line[1:].split(':|:') + if len(vals) == 2: + t, c = vals + nc = '' + else: + t,c,nc = vals try: self.colorboxes[i].setCurrentIndex(self.colorboxes[i].findText(c)) + self.nfcolorboxes[i].setCurrentIndex(self.nfcolorboxes[i].findText(nc)) self.tagboxes[i].setText(t) except: pass @@ -109,28 +147,35 @@ class TagWizard(QDialog): res = ("program:\n#tag wizard -- do not directly edit\n" " t = field('tags');\n first_non_empty(\n") lines = [] - for tb, cb in zip(self.tagboxes, self.colorboxes): + for tb, cb, nfcb in zip(self.tagboxes, self.colorboxes, self.nfcolorboxes): tags = [t.strip() for t in unicode(tb.text()).split(',') if t.strip()] tags = '$|^'.join(tags) c = unicode(cb.currentText()).strip() - if not tags or not c: + nfc = unicode(nfcb.currentText()).strip() + if not tags or not (c or nfc): continue if c not in self.colors: error_dialog(self, _('Invalid color'), _('The color {0} is not valid').format(c), show=True, show_copy_button=False) return False - lines.append(" in_list(t, ',', '^{0}$', '{1}', '')".format(tags, c)) + if nfc not in self.colors: + error_dialog(self, _('Invalid color'), + _('The color {0} is not valid').format(nfc), + show=True, show_copy_button=False) + return False + lines.append(" in_list(t, ',', '^{0}$', '{1}', '{2}')".format(tags, c, nfc)) res += ',\n'.join(lines) res += ')\n' self.template = res res = '' - for tb, cb in zip(self.tagboxes, self.colorboxes): + for tb, cb, nfcb in zip(self.tagboxes, self.colorboxes, self.nfcolorboxes): t = unicode(tb.text()).strip() if t.endswith(','): t = t[:-1] c = unicode(cb.currentText()).strip() + nfc = unicode(nfcb.currentText()).strip() if t and c: - res += '#' + t + ':|:' + c + '\n' + res += '#' + t + ':|:' + c + ':|:' + nfc + '\n' self.template += res self.accept() From 67d570de1c99867e69796cac4710a409bfaf34c2 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sun, 29 May 2011 13:39:35 +0100 Subject: [PATCH 35/47] Permit empty keys in templates. Simplifies using functions that don't require a value --- src/calibre/ebooks/metadata/book/base.py | 2 ++ src/calibre/library/save_to_disk.py | 2 ++ src/calibre/utils/formatter.py | 2 ++ 3 files changed, 6 insertions(+) diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py index 179a96e578..f98bebe1dc 100644 --- a/src/calibre/ebooks/metadata/book/base.py +++ b/src/calibre/ebooks/metadata/book/base.py @@ -42,6 +42,8 @@ field_metadata = FieldMetadata() class SafeFormat(TemplateFormatter): def get_value(self, orig_key, args, kwargs): + if not orig_key: + return '' key = orig_key.lower() if key != 'title_sort' and key not in TOP_LEVEL_IDENTIFIERS: key = field_metadata.search_term_to_field_key(key) diff --git a/src/calibre/library/save_to_disk.py b/src/calibre/library/save_to_disk.py index dc83b44c01..5f49833564 100644 --- a/src/calibre/library/save_to_disk.py +++ b/src/calibre/library/save_to_disk.py @@ -134,6 +134,8 @@ class SafeFormat(TemplateFormatter): ''' def get_value(self, key, args, kwargs): + if key == '': + return '' try: key = key.lower() try: diff --git a/src/calibre/utils/formatter.py b/src/calibre/utils/formatter.py index 695355330e..ebf47db854 100644 --- a/src/calibre/utils/formatter.py +++ b/src/calibre/utils/formatter.py @@ -342,6 +342,8 @@ class EvalFormatter(TemplateFormatter): A template formatter that uses a simple dict instead of an mi instance ''' def get_value(self, key, args, kwargs): + if key == '': + return '' key = key.lower() return kwargs.get(key, _('No such variable ') + key) From 0d57a3fb18f03574a242789cce9189e33aa2e54e Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sun, 29 May 2011 14:09:01 +0100 Subject: [PATCH 36/47] Correct some problems with setting the ondevice column values when the device is disconnected. --- src/calibre/gui2/device.py | 3 ++- src/calibre/gui2/library/models.py | 2 +- src/calibre/utils/formatter_functions.py | 5 +---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/calibre/gui2/device.py b/src/calibre/gui2/device.py index 3977a6bca1..dd9d7aaa50 100644 --- a/src/calibre/gui2/device.py +++ b/src/calibre/gui2/device.py @@ -1294,7 +1294,8 @@ class DeviceMixin(object): # {{{ self.book_db_uuid_path_map = None return - if not hasattr(self, 'db_book_uuid_cache'): + if not self.device_manager.is_device_connected or \ + not hasattr(self, 'db_book_uuid_cache'): return loc if self.book_db_id_cache is None: diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py index 554b104c34..793f2d353b 100644 --- a/src/calibre/gui2/library/models.py +++ b/src/calibre/gui2/library/models.py @@ -125,7 +125,7 @@ class BooksModel(QAbstractTableModel): # {{{ def refresh_ondevice(self): self.db.refresh_ondevice() - self.resort() + self.refresh(reset=False) self.research() def set_book_on_device_func(self, func): diff --git a/src/calibre/utils/formatter_functions.py b/src/calibre/utils/formatter_functions.py index d7b6e63f5e..76faf04941 100644 --- a/src/calibre/utils/formatter_functions.py +++ b/src/calibre/utils/formatter_functions.py @@ -579,10 +579,7 @@ class BuiltinOndevice(BuiltinFormatterFunction): def evaluate(self, formatter, kwargs, mi, locals): if mi.ondevice_col: - try: - return _('Yes') - except: - pass + return _('Yes') return '' class BuiltinFirstNonEmpty(BuiltinFormatterFunction): From 322e6d9ac44e9304cccfedda1d69a654f9805673 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sun, 29 May 2011 15:09:56 +0100 Subject: [PATCH 37/47] Add an RE box to the color tags wizard. Add the necessary function to the template language. Fix problem with passing mi to the template editor. --- src/calibre/ebooks/metadata/book/base.py | 2 +- .../gui2/dialogs/template_line_editor.py | 67 +++++++++++++------ src/calibre/gui2/preferences/look_feel.py | 3 +- src/calibre/utils/formatter_functions.py | 22 +++++- 4 files changed, 70 insertions(+), 24 deletions(-) diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py index f98bebe1dc..3e2201f6a4 100644 --- a/src/calibre/ebooks/metadata/book/base.py +++ b/src/calibre/ebooks/metadata/book/base.py @@ -47,7 +47,7 @@ class SafeFormat(TemplateFormatter): key = orig_key.lower() if key != 'title_sort' and key not in TOP_LEVEL_IDENTIFIERS: key = field_metadata.search_term_to_field_key(key) - if key is None or key not in self.book.all_field_keys(): + if key is None or (self.book and key not in self.book.all_field_keys()): raise ValueError(_('Value: unknown field ') + orig_key) b = self.book.get_user_metadata(key, False) if b and b['datatype'] == 'int' and self.book.get(key, 0) == 0: diff --git a/src/calibre/gui2/dialogs/template_line_editor.py b/src/calibre/gui2/dialogs/template_line_editor.py index d466cecc55..3d199b156c 100644 --- a/src/calibre/gui2/dialogs/template_line_editor.py +++ b/src/calibre/gui2/dialogs/template_line_editor.py @@ -5,7 +5,7 @@ __license__ = 'GPL v3' __copyright__ = '2010, Kovid Goyal ' __docformat__ = 'restructuredtext en' -from PyQt4.Qt import (QLineEdit, QDialog, QGridLayout, QLabel, +from PyQt4.Qt import (QLineEdit, QDialog, QGridLayout, QLabel, QCheckBox, QDialogButtonBox, QColor, QComboBox, QIcon) from calibre.gui2.dialogs.template_dialog import TemplateDialog @@ -73,8 +73,8 @@ class TagWizard(QDialog): h.setToolTip('

' + _('You can enter more than one tag per box, separated by commas. ' 'The comparison ignores letter case.
' - 'A tag value can be a regular expression. ' - 'When using regular expressions, note that the wizard ' + 'A tag value can be a regular expression. Check the box to turn ' + 'them on. When using regular expressions, note that the wizard ' 'puts anchors (^ and $) around the expression, so you ' 'must ensure your expression matches from the beginning ' 'to the end of the tag.
' @@ -85,22 +85,29 @@ class TagWizard(QDialog): '

  • .*mystery.* matches any tag containing ' 'the word "mystery"
    • ') + '

    ') l.addWidget(h , 0, 0, 1, 1) + + c = QLabel(_('is RE')) + c.setToolTip('

    ' + + _('Check this box if the tag box contains regular expressions') + '

    ') + l.addWidget(c, 0, 1, 1, 1) + c = QLabel(_('Color if tag found')) c.setToolTip('

    ' + _('At least one of the two color boxes must have a value. Leave ' 'one color box empty if you want the template to use the next ' 'line in this wizard. If both boxes are filled in, the rest of ' 'the lines in this wizard will be ignored.') + '

    ') - l.addWidget(c, 0, 1, 1, 1) + l.addWidget(c, 0, 2, 1, 1) c = QLabel(_('Color if tag not found')) c.setToolTip('

    ' + _('This box is usually filled in only on the last test. If it is ' 'filled in before the last test, then the color for tag found box ' 'must be empty or all the rest of the tests will be ignored.') + '

    ') - l.addWidget(c, 0, 2, 1, 1) + l.addWidget(c, 0, 3, 1, 1) self.tagboxes = [] self.colorboxes = [] self.nfcolorboxes = [] + self.reboxes = [] self.colors = [unicode(s) for s in list(QColor.colorNames())] self.colors.insert(0, '') for i in range(0, 10): @@ -109,14 +116,20 @@ class TagWizard(QDialog): tb.update_items_cache(self.tags) self.tagboxes.append(tb) l.addWidget(tb, i+1, 0, 1, 1) - cb = QComboBox(self) - cb.addItems(self.colors) - self.colorboxes.append(cb) - l.addWidget(cb, i+1, 1, 1, 1) - cb = QComboBox(self) - cb.addItems(self.colors) - self.nfcolorboxes.append(cb) - l.addWidget(cb, i+1, 2, 1, 1) + + w = QCheckBox(self) + self.reboxes.append(w) + l.addWidget(w, i+1, 1, 1, 1) + + w = QComboBox(self) + w.addItems(self.colors) + self.colorboxes.append(w) + l.addWidget(w, i+1, 2, 1, 1) + + w = QComboBox(self) + w.addItems(self.colors) + self.nfcolorboxes.append(w) + l.addWidget(w, i+1, 3, 1, 1) if txt: lines = txt.split('\n')[3:] @@ -127,18 +140,20 @@ class TagWizard(QDialog): if len(vals) == 2: t, c = vals nc = '' + re = False else: - t,c,nc = vals + t,c,nc,re = vals try: self.colorboxes[i].setCurrentIndex(self.colorboxes[i].findText(c)) self.nfcolorboxes[i].setCurrentIndex(self.nfcolorboxes[i].findText(nc)) self.tagboxes[i].setText(t) + self.reboxes[i].setChecked(re == '2') except: pass i += 1 bb = QDialogButtonBox(QDialogButtonBox.Ok|QDialogButtonBox.Cancel, parent=self) - l.addWidget(bb, 100, 1, 1, 1) + l.addWidget(bb, 100, 2, 1, 2) bb.accepted.connect(self.accepted) bb.rejected.connect(self.reject) self.template = '' @@ -147,11 +162,16 @@ class TagWizard(QDialog): res = ("program:\n#tag wizard -- do not directly edit\n" " t = field('tags');\n first_non_empty(\n") lines = [] - for tb, cb, nfcb in zip(self.tagboxes, self.colorboxes, self.nfcolorboxes): + for tb, cb, nfcb, reb in zip(self.tagboxes, self.colorboxes, + self.nfcolorboxes, self.reboxes): tags = [t.strip() for t in unicode(tb.text()).split(',') if t.strip()] - tags = '$|^'.join(tags) c = unicode(cb.currentText()).strip() nfc = unicode(nfcb.currentText()).strip() + re = reb.checkState() + if re == 2: + tags = '$|^'.join(tags) + else: + tags = ','.join(tags) if not tags or not (c or nfc): continue if c not in self.colors: @@ -164,18 +184,25 @@ class TagWizard(QDialog): _('The color {0} is not valid').format(nfc), show=True, show_copy_button=False) return False - lines.append(" in_list(t, ',', '^{0}$', '{1}', '{2}')".format(tags, c, nfc)) + if re == 2: + lines.append(" in_list(t, ',', '^{0}$', '{1}', '{2}')".\ + format(tags, c, nfc)) + else: + lines.append(" str_in_list(t, ',', '{0}', '{1}', '{2}')".\ + format(tags, c, nfc)) res += ',\n'.join(lines) res += ')\n' self.template = res res = '' - for tb, cb, nfcb in zip(self.tagboxes, self.colorboxes, self.nfcolorboxes): + for tb, cb, nfcb, reb in zip(self.tagboxes, self.colorboxes, + self.nfcolorboxes, self.reboxes): t = unicode(tb.text()).strip() if t.endswith(','): t = t[:-1] c = unicode(cb.currentText()).strip() nfc = unicode(nfcb.currentText()).strip() + re = unicode(reb.checkState()) if t and c: - res += '#' + t + ':|:' + c + ':|:' + nfc + '\n' + res += '#' + t + ':|:' + c + ':|:' + nfc + ':|:' + re + '\n' self.template += res self.accept() diff --git a/src/calibre/gui2/preferences/look_feel.py b/src/calibre/gui2/preferences/look_feel.py index fcdd56fd5f..37e4588b9b 100644 --- a/src/calibre/gui2/preferences/look_feel.py +++ b/src/calibre/gui2/preferences/look_feel.py @@ -209,8 +209,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): mi=None try: idx = gui.library_view.currentIndex().row() - if idx: - mi = db.get_metadata(idx, index_is_id=False) + mi = db.get_metadata(idx, index_is_id=False) except: pass diff --git a/src/calibre/utils/formatter_functions.py b/src/calibre/utils/formatter_functions.py index 76faf04941..7d5dbe3e0e 100644 --- a/src/calibre/utils/formatter_functions.py +++ b/src/calibre/utils/formatter_functions.py @@ -8,7 +8,7 @@ __license__ = 'GPL v3' __copyright__ = '2010, Kovid Goyal ' __docformat__ = 'restructuredtext en' -import inspect, re, traceback, sys +import inspect, re, traceback from calibre.utils.titlecase import titlecase from calibre.utils.icu import capitalize, strcmp, sort_key @@ -336,6 +336,25 @@ class BuiltinInList(BuiltinFormatterFunction): return fv return nfv +class BuiltinStrInList(BuiltinFormatterFunction): + name = 'str_in_list' + arg_count = 5 + doc = _('str_in_list(val, separator, string, found_val, not_found_val) -- ' + 'treat val as a list of items separated by separator, ' + 'comparing the string against each value in the list. If the ' + 'string matches a value, return found_val, otherwise return ' + 'not_found_val. If the string contains separators, then it is ' + 'also treated as a list and each value is checked.') + + def evaluate(self, formatter, kwargs, mi, locals, val, sep, str, fv, nfv): + l = [v.strip() for v in val.split(sep) if v.strip()] + c = [v.strip() for v in str.split(sep) if v.strip()] + for v in l: + for t in c: + if strcmp(t, v) == 0: + return fv + return nfv + class BuiltinRe(BuiltinFormatterFunction): name = 're' arg_count = 3 @@ -700,6 +719,7 @@ builtin_select = BuiltinSelect() builtin_shorten = BuiltinShorten() builtin_strcat = BuiltinStrcat() builtin_strcmp = BuiltinStrcmp() +builtin_str_in_list = BuiltinStrInList() builtin_subitems = BuiltinSubitems() builtin_sublist = BuiltinSublist() builtin_substr = BuiltinSubstr() From b9b6286209dcf3e3355f6696cdfb0218e612c017 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sun, 29 May 2011 15:18:19 +0100 Subject: [PATCH 38/47] ... --- src/calibre/manual/template_lang.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/calibre/manual/template_lang.rst b/src/calibre/manual/template_lang.rst index 28c9855ce4..ec398b5d28 100644 --- a/src/calibre/manual/template_lang.rst +++ b/src/calibre/manual/template_lang.rst @@ -130,6 +130,7 @@ The functions available are: * ``switch(pattern, value, pattern, value, ..., else_value)`` -- for each ``pattern, value`` pair, checks if the field matches the regular expression ``pattern`` and if so, returns that ``value``. If no ``pattern`` matches, then ``else_value`` is returned. You can have as many ``pattern, value`` pairs as you want. * ``lookup(pattern, field, pattern, field, ..., else_field)`` -- like switch, except the arguments are field (metadata) names, not text. The value of the appropriate field will be fetched and used. Note that because composite columns are fields, you can use this function in one composite field to use the value of some other composite field. This is extremely useful when constructing variable save paths (more later). * ``select(key)`` -- interpret the field as a comma-separated list of items, with the items being of the form "id:value". Find the pair with the id equal to key, and return the corresponding value. This function is particularly useful for extracting a value such as an isbn from the set of identifiers for a book. + * ``str_in_list(val, separator, string, found_val, not_found_val)`` -- treat val as a list of items separated by separator, comparing the string against each value in the list. If the string matches a value, return found_val, otherwise return not_found_val. If the string contains separators, then it is also treated as a list and each value is checked. * ``subitems(val, start_index, end_index)`` -- This function is used to break apart lists of tag-like hierarchical items such as genres. It interprets the value as a comma-separated list of tag-like items, where each item is a period-separated list. Returns a new list made by first finding all the period-separated tag-like items, then for each such item extracting the components from `start_index` to `end_index`, then combining the results back together. The first component in a period-separated list has an index of zero. If an index is negative, then it counts from the end of the list. As a special case, an end_index of zero is assumed to be the length of the list. Examples:: Assuming a #genre column containing "A.B.C": @@ -272,10 +273,10 @@ Function classification summary: * Boolean: ``and``, ``or``, ``not``. The function ``if_empty`` is similar to ``and`` called with one argument. * If-then-else: ``contains``, ``test`` * Iterating over values: ``first_non_empty``, ``lookup``, ``switch`` - * List lookup: ``in_list``, ``list_item``, ``select``, + * List lookup: ``in_list``, ``list_item``, ``select``, ``str_in_list`` * List manipulation: ``count``, ``merge_lists``, ``sublist``, ``subitems`` * Recursion: ``eval``, ``template`` - * Relational: ``cmp`` , ``strcmp`` for strings + * Relational: ``cmp`` (for numbers), ``strcmp`` (for strings) * String case changes: ``lowercase``, ``uppercase``, ``titlecase``, ``capitalize`` * String manipulation: ``re``, ``shorten``, ``substr`` * Other: ``assign``, ``booksize``, ``format_date``, ``ondevice`` ``print`` From 87bd2bd5716640f114acae839e7c1c598c477298 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sun, 29 May 2011 15:46:17 +0100 Subject: [PATCH 39/47] Make formatter functions that use regexps ignore case --- src/calibre/utils/formatter_functions.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/calibre/utils/formatter_functions.py b/src/calibre/utils/formatter_functions.py index 7d5dbe3e0e..32822e1d72 100644 --- a/src/calibre/utils/formatter_functions.py +++ b/src/calibre/utils/formatter_functions.py @@ -269,7 +269,7 @@ class BuiltinLookup(BuiltinFormatterFunction): while i < len(args): if i + 1 >= len(args): return formatter.vformat('{' + args[i].strip() + '}', [], kwargs) - if re.search(args[i], val): + if re.search(args[i], val, flags=re.I): return formatter.vformat('{'+args[i+1].strip() + '}', [], kwargs) i += 2 @@ -295,7 +295,7 @@ class BuiltinContains(BuiltinFormatterFunction): def evaluate(self, formatter, kwargs, mi, locals, val, test, value_if_present, value_if_not): - if re.search(test, val): + if re.search(test, val, flags=re.I): return value_if_present else: return value_if_not @@ -316,7 +316,7 @@ class BuiltinSwitch(BuiltinFormatterFunction): while i < len(args): if i + 1 >= len(args): return args[i] - if re.search(args[i], val): + if re.search(args[i], val, flags=re.I): return args[i+1] i += 2 @@ -332,7 +332,7 @@ class BuiltinInList(BuiltinFormatterFunction): def evaluate(self, formatter, kwargs, mi, locals, val, sep, pat, fv, nfv): l = [v.strip() for v in val.split(sep) if v.strip()] for v in l: - if re.search(pat, v): + if re.search(pat, v, flags=re.I): return fv return nfv @@ -364,7 +364,7 @@ class BuiltinRe(BuiltinFormatterFunction): 'python-compatible regular expressions') def evaluate(self, formatter, kwargs, mi, locals, val, pattern, replacement): - return re.sub(pattern, replacement, val) + return re.sub(pattern, replacement, val, flags=re.I) class BuiltinIfempty(BuiltinFormatterFunction): name = 'ifempty' From 267687f424a3527aac683a1ea00c0d87244b0fe9 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sun, 29 May 2011 15:48:20 +0100 Subject: [PATCH 40/47] ... --- src/calibre/manual/template_lang.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/calibre/manual/template_lang.rst b/src/calibre/manual/template_lang.rst index ec398b5d28..f1d2844d37 100644 --- a/src/calibre/manual/template_lang.rst +++ b/src/calibre/manual/template_lang.rst @@ -114,6 +114,8 @@ The syntax for using functions is ``{field:function(arguments)}``, or ``{field:f If you have programming experience, please note that the syntax in this mode (single function) is not what you might expect. Strings are not quoted. Spaces are significant. All arguments must be constants; there is no sub-evaluation. Use :ref:`template program mode ` and :ref:`general program mode ` to avoid these differences. +Many functions use regular expressions. In all cases, regular expression matching is case-insensitive. + The functions available are: * ``lowercase()`` -- return value of the field in lower case. From 35bf5ed46e359a13211abd3f71a78da16de309db Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sun, 29 May 2011 17:36:06 +0100 Subject: [PATCH 41/47] Refresh the db when on_device is refreshed only if composite columns are defined. --- src/calibre/gui2/library/models.py | 2 +- src/calibre/library/caches.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py index 793f2d353b..554b104c34 100644 --- a/src/calibre/gui2/library/models.py +++ b/src/calibre/gui2/library/models.py @@ -125,7 +125,7 @@ class BooksModel(QAbstractTableModel): # {{{ def refresh_ondevice(self): self.db.refresh_ondevice() - self.refresh(reset=False) + self.resort() self.research() def set_book_on_device_func(self, func): diff --git a/src/calibre/library/caches.py b/src/calibre/library/caches.py index 98fd3a9fbc..2ad425fc00 100644 --- a/src/calibre/library/caches.py +++ b/src/calibre/library/caches.py @@ -914,6 +914,8 @@ class ResultCache(SearchQueryParser): # {{{ return len(self._map) def refresh_ondevice(self, db): + if self.composites: + self.refresh(db) ondevice_col = self.FIELD_MAP['ondevice'] for item in self._data: if item is not None: From 88709bb88ffbdc2cd5972987b89b4047fde831b2 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 29 May 2011 11:06:56 -0600 Subject: [PATCH 42/47] Windows installer: Remember and use previous settings for installing desktop icons, adding to path, etc. --- setup/installer/windows/wix-template.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/setup/installer/windows/wix-template.xml b/setup/installer/windows/wix-template.xml index d4bfbc3c7c..0a85b6fb81 100644 --- a/setup/installer/windows/wix-template.xml +++ b/setup/installer/windows/wix-template.xml @@ -17,6 +17,7 @@ IncludeMaximum="yes" OnlyDetect="no" Language="1033" + MigrateFeatures="yes" Property="OLDPRODUCTFOUND"/> Date: Sun, 29 May 2011 11:26:35 -0600 Subject: [PATCH 43/47] Observatorul cultural by song2 and update Dilema Veche --- recipes/dilemaveche.recipe | 116 +++++++++++++++------------ recipes/observatorul_cultural.recipe | 64 +++++++++++++++ 2 files changed, 130 insertions(+), 50 deletions(-) create mode 100644 recipes/observatorul_cultural.recipe diff --git a/recipes/dilemaveche.recipe b/recipes/dilemaveche.recipe index 0d5013b287..8ba75c4123 100644 --- a/recipes/dilemaveche.recipe +++ b/recipes/dilemaveche.recipe @@ -1,55 +1,71 @@ -# -*- coding: utf-8 -*- -#!/usr/bin/env python - -__license__ = 'GPL v3' -__copyright__ = u'2011, Silviu Cotoar\u0103' -''' -dilemaveche.ro -''' - from calibre.web.feeds.news import BasicNewsRecipe class DilemaVeche(BasicNewsRecipe): - title = u'Dilema Veche' - __author__ = u'Silviu Cotoar\u0103' - description = u'Sunt vechi, domnule!' - publisher = u'Dilema Veche' - oldest_article = 50 - language = 'ro' - max_articles_per_feed = 100 - no_stylesheets = True - use_embedded_content = False - category = 'Ziare' - encoding = 'utf-8' - cover_url = 'http://www.dilemaveche.ro/sites/all/themes/dilema/theme/dilema_two/layouter/dilema_two_homepage/logo.png' - - conversion_options = { - 'comments' : description - ,'tags' : category - ,'language' : language - ,'publisher' : publisher - } - - keep_only_tags = [ - dict(name='h1', attrs={'class':'art_title'}) - , dict(name='h1', attrs={'class':'art_title online'}) - , dict(name='div', attrs={'class':'item'}) - , dict(name='div', attrs={'class':'art_content'}) - ] - + title = u'Dilema Veche' # apare vinerea, mai pe dupa-masa,depinde de Luiza cred (care se semneaza ca fiind creatorul fiecarui articol in feed-ul RSS) + __author__ = 'song2' # inspirat din scriptul pentru Le Monde. Inspired from the Le Monde script + description = '"Sint vechi, domnule!" (I.L. Caragiale)' + publisher = 'Adevarul Holding' + oldest_article = 7 + max_articles_per_feed = 200 + encoding = 'utf8' + language = 'ro' + masthead_url = 'http://www.dilemaveche.ro/sites/all/themes/dilema/theme/dilema_two/layouter/dilema_two_homepage/logo.png' + publication_type = 'magazine' + feeds = [ + ('Editoriale si opinii - Situatiunea', 'http://www.dilemaveche.ro/taxonomy/term/37/0/feed'), + ('Editoriale si opinii - Pe ce lume traim', 'http://www.dilemaveche.ro/taxonomy/term/38/0/feed'), + ('Editoriale si opinii - Bordeie si obiceie', 'http://www.dilemaveche.ro/taxonomy/term/44/0/feed'), + ('Editoriale si opinii - Talc Show', 'http://www.dilemaveche.ro/taxonomy/term/44/0/feed'), + ('Tema saptamanii', 'http://www.dilemaveche.ro/taxonomy/term/19/0/feed'), + ('La zi in cultura - Dilema va recomanda', 'http://www.dilemaveche.ro/taxonomy/term/58/0/feed'), + ('La zi in cultura - Carte', 'http://www.dilemaveche.ro/taxonomy/term/14/0/feed'), + ('La zi in cultura - Film', 'http://www.dilemaveche.ro/taxonomy/term/13/0/feed'), + ('La zi in cultura - Muzica', 'http://www.dilemaveche.ro/taxonomy/term/1341/0/feed'), + ('La zi in cultura - Arte performative', 'http://www.dilemaveche.ro/taxonomy/term/1342/0/feed'), + ('La zi in cultura - Arte vizuale', 'http://www.dilemaveche.ro/taxonomy/term/1512/0/feed'), + ('Societate - Ieri cu vedere spre azi', 'http://www.dilemaveche.ro/taxonomy/term/15/0/feed'), + ('Societate - Din polul opus', 'http://www.dilemaveche.ro/taxonomy/term/41/0/feed'), + ('Societate - Mass comedia', 'http://www.dilemaveche.ro/taxonomy/term/43/0/feed'), + ('Societate - La singular si la plural', 'http://www.dilemaveche.ro/taxonomy/term/42/0/feed'), + ('Oameni si idei - Educatie', 'http://www.dilemaveche.ro/taxonomy/term/46/0/feed'), + ('Oameni si idei - Polemici si dezbateri', 'http://www.dilemaveche.ro/taxonomy/term/48/0/feed'), + ('Oameni si idei - Stiinta si tehnologie', 'http://www.dilemaveche.ro/taxonomy/term/46/0/feed'), + ('Dileme on-line', 'http://www.dilemaveche.ro/taxonomy/term/005/0/feed') + ] + remove_tags_before = dict(name='div',attrs={'class':'spacer_10'}) remove_tags = [ - dict(name='div', attrs={'class':['article_details']}) - , dict(name='div', attrs={'class':['controale']}) - , dict(name='div', attrs={'class':['art_related_left']}) - ] + dict(name='div', attrs={'class':'art_related_left'}), + dict(name='div', attrs={'class':'controale'}), + dict(name='div', attrs={'class':'simple_overlay'}), + ] + remove_tags_after = [dict(id='facebookLike')] + remove_javascript = True + no_stylesheets = True + remove_empty_feeds = True + extra_css = """ + body{font-family: Georgia,Times,serif } + img{margin-bottom: 0.4em; display:block} + """ + def get_cover_url(self): + cover_url = None + soup = self.index_to_soup('http://dilemaveche.ro') + link_item = soup.find('div',attrs={'class':'box_dr_pdf_picture'}) + if link_item and link_item.a: + cover_url = link_item.a['href'] + br = BasicNewsRecipe.get_browser() + try: + br.open(cover_url) + except: #daca nu gaseste pdf-ul + self.log("\nPDF indisponibil") + link_item = soup.find('div',attrs={'class':'box_dr_pdf_picture'}) + if link_item and link_item.img: + cover_url = link_item.img['src'] + br = BasicNewsRecipe.get_browser() + try: + br.open(cover_url) + except: #daca nu gaseste nici imaginea mica mica + print('Mama lor de nenorociti! nu este nici pdf nici imagine') + cover_url ='http://www.dilemaveche.ro/sites/all/themes/dilema/theme/dilema_two/layouter/dilema_two_homepage/logo.png' + return cover_url + cover_margins = (10, 15, '#ffffff') - remove_tags_after = [ - dict(name='div', attrs={'class':['article_details']}) - ] - - feeds = [ - (u'Feeds', u'http://www.dilemaveche.ro/rss.xml') - ] - - def preprocess_html(self, soup): - return self.adeify_images(soup) diff --git a/recipes/observatorul_cultural.recipe b/recipes/observatorul_cultural.recipe new file mode 100644 index 0000000000..0d64334fd5 --- /dev/null +++ b/recipes/observatorul_cultural.recipe @@ -0,0 +1,64 @@ +import re +from calibre.web.feeds.news import BasicNewsRecipe +coverpage = None + +class ObservatorulCultural(BasicNewsRecipe): + title = u'Observatorul cultural' + __author__ = 'song2' #prelucrat dupa un script de http://www.thenowhereman.com + encoding = 'utf-8' + language = 'ro' + publication_type = 'magazine' + description = 'Spiritul critic in acţiune\n' + no_stylesheets = True + remove_javascript = True + masthead_url='http://www.observatorcultural.ro/userfiles/article/sigla%20Observator%20cultural_02231058.JPG' + keep_only_tags = [ + dict(name='div', attrs={'class':'detaliuArticol'})] + remove_tags = [dict(name='div', attrs={'class':'comentariiArticol'}), + dict(name='div', attrs={'class':'postComment'}), + dict(name='div', attrs={'class':'utileArticol'}), + dict(name='p', attrs={'class':'butonComenteaza'}), + dict(name='h5'), + dict(name='div', attrs={'style':'margin-top: 0px; padding-top: 0px;'}) + ] + def parse_index(self): + soup = self.index_to_soup('http://www.observatorcultural.ro/Arhiva*-archive.html') + issueTag = soup.find('a', href=re.compile("observatorcultural.ro\/Numarul")) + issueURL = issueTag['href'] + print issueURL; + issueSoup = self.index_to_soup(issueURL) + feeds = [] + stories = [] + for categorie in issueSoup.findAll('dl',attrs={'class':'continutArhive'}): + categ=self.tag_to_string(categorie.find('dt')) + for story in categorie.findAll('dd'): + title=[] + for bucatele in story.findAll('a'): + title.append(bucatele) + if len(title)==1: #daca articolul nu are autor + stories.append({ + 'title' : self.tag_to_string(title[0]), + 'url' : title[0]['href'], + 'date' : '', + 'author' : ''}) + else: # daca articolul are autor len(title)=2 + stories.append({ + 'title' : self.tag_to_string(title[1]), + 'url' :title[1]['href'], + 'date' : '', + 'author' : self.tag_to_string(title[0])}) + print(self.tag_to_string(title[0])) + if 'Editorial' in categ: + global coverpage + coverpage=title[1]['href'] # am luat link-ul spre editorial + feeds.append((categ,stories)) + stories = [] + print feeds + return feeds +#procedura de luat coperta + def get_cover_url(self): + soup = self.index_to_soup(coverpage) + link_item = soup.find('a',attrs={'rel':'lightbox'}) # caut imaginea textului + a='' + cover_url = a.join(link_item.img['src'].split('_details_')) + return cover_url From f25c4232618063c096653faee6e2337b39fa43bf Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sun, 29 May 2011 18:28:21 +0100 Subject: [PATCH 44/47] Got the ondevice composite column optimization to work. --- src/calibre/library/caches.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/calibre/library/caches.py b/src/calibre/library/caches.py index 2ad425fc00..470bbcdfa8 100644 --- a/src/calibre/library/caches.py +++ b/src/calibre/library/caches.py @@ -200,6 +200,11 @@ class CacheRow(list): # {{{ def __getslice__(self, i, j): return self.__getitem__(slice(i, j)) + def refresh_composites(self): + for c in self._composites: + self[c] = None + self._must_do = True + # }}} class ResultCache(SearchQueryParser): # {{{ @@ -914,12 +919,11 @@ class ResultCache(SearchQueryParser): # {{{ return len(self._map) def refresh_ondevice(self, db): - if self.composites: - self.refresh(db) ondevice_col = self.FIELD_MAP['ondevice'] for item in self._data: if item is not None: item[ondevice_col] = db.book_on_device_string(item[0]) + item.refresh_composites() def refresh(self, db, field=None, ascending=True): temp = db.conn.get('SELECT * FROM meta2') From 7a6f8b13a2d83e38117268f3abd2d0845d36cd8d Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 29 May 2011 12:58:54 -0600 Subject: [PATCH 45/47] ... --- src/calibre/gui2/update.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/calibre/gui2/update.py b/src/calibre/gui2/update.py index 847b5785e9..9aae245d98 100644 --- a/src/calibre/gui2/update.py +++ b/src/calibre/gui2/update.py @@ -49,11 +49,12 @@ class UpdateNotification(QDialog): self.logo.setMaximumWidth(110) self.logo.setPixmap(QPixmap(I('lt.png')).scaled(100, 100, Qt.IgnoreAspectRatio, Qt.SmoothTransformation)) - self.label = QLabel('

    '+ + self.label = QLabel(('

    '+ _('%s has been updated to version %s. ' 'See the new features. Only update if one of the ' - 'new features or bug fixes is important to you.')%(__appname__, version)) + '">new features.') + '

    '+_('Update only if one of the ' + 'new features or bug fixes is important to you. ' + 'If the current version works well for you, do not update.'))%(__appname__, version)) self.label.setOpenExternalLinks(True) self.label.setWordWrap(True) self.setWindowTitle(_('Update available!')) From 1ae716a115664b46b51a02355fa11df6c3c5972b Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 29 May 2011 14:38:35 -0600 Subject: [PATCH 46/47] Change default toolbar to make it a little more newbie on small screen/non maximized window friendly --- src/calibre/gui2/__init__.py | 7 ++++--- src/calibre/gui2/layout.py | 1 - src/calibre/gui2/preferences/look_feel.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py index 2cb18f3bda..8499e304c3 100644 --- a/src/calibre/gui2/__init__.py +++ b/src/calibre/gui2/__init__.py @@ -48,8 +48,9 @@ else: gprefs.defaults['action-layout-menubar-device'] = () gprefs.defaults['action-layout-toolbar'] = ( 'Add Books', 'Edit Metadata', None, 'Convert Books', 'View', None, - 'Choose Library', 'Donate', None, 'Fetch News', 'Store', 'Save To Disk', - 'Connect Share', None, 'Remove Books', None, 'Help', 'Preferences', + 'Store', 'Donate', 'Fetch News', 'Help', None, + 'Remove Books', 'Choose Library', 'Save To Disk', + 'Connect Share', 'Preferences', ) gprefs.defaults['action-layout-toolbar-device'] = ( 'Add Books', 'Edit Metadata', None, 'Convert Books', 'View', @@ -75,7 +76,7 @@ gprefs.defaults['action-layout-context-menu-device'] = ( gprefs.defaults['show_splash_screen'] = True gprefs.defaults['toolbar_icon_size'] = 'medium' gprefs.defaults['automerge'] = 'ignore' -gprefs.defaults['toolbar_text'] = 'auto' +gprefs.defaults['toolbar_text'] = 'always' gprefs.defaults['font'] = None gprefs.defaults['tags_browser_partition_method'] = 'first letter' gprefs.defaults['tags_browser_collapse_at'] = 100 diff --git a/src/calibre/gui2/layout.py b/src/calibre/gui2/layout.py index 7d07463b87..76b9f5f9a2 100644 --- a/src/calibre/gui2/layout.py +++ b/src/calibre/gui2/layout.py @@ -238,7 +238,6 @@ class Spacer(QWidget): # {{{ self.l.addStretch(10) # }}} - class MainWindowMixin(object): # {{{ def __init__(self, db): diff --git a/src/calibre/gui2/preferences/look_feel.py b/src/calibre/gui2/preferences/look_feel.py index 37e4588b9b..862636cb04 100644 --- a/src/calibre/gui2/preferences/look_feel.py +++ b/src/calibre/gui2/preferences/look_feel.py @@ -129,7 +129,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): (_('Medium'), 'medium'), (_('Large'), 'large')] r('toolbar_icon_size', gprefs, choices=choices) - choices = [(_('Automatic'), 'auto'), (_('Always'), 'always'), + choices = [(_('If there is enough room'), 'auto'), (_('Always'), 'always'), (_('Never'), 'never')] r('toolbar_text', gprefs, choices=choices) From 1035de793d7feb398966aa2c83c5e42b11a260c4 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 29 May 2011 15:04:37 -0600 Subject: [PATCH 47/47] ... --- src/calibre/translations/calibre.pot | 945 ++++++++++++++++----------- 1 file changed, 547 insertions(+), 398 deletions(-) diff --git a/src/calibre/translations/calibre.pot b/src/calibre/translations/calibre.pot index a8273ccac2..50576b12ae 100644 --- a/src/calibre/translations/calibre.pot +++ b/src/calibre/translations/calibre.pot @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: calibre 0.8.3\n" -"POT-Creation-Date: 2011-05-27 10:15+MDT\n" -"PO-Revision-Date: 2011-05-27 10:15+MDT\n" +"POT-Creation-Date: 2011-05-29 15:03+MDT\n" +"PO-Revision-Date: 2011-05-29 15:03+MDT\n" "Last-Translator: Automatically generated\n" "Language-Team: LANGUAGE\n" "MIME-Version: 1.0\n" @@ -46,10 +46,10 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:253 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:34 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:35 -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:89 -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:455 -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:460 -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:724 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:88 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:454 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:459 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:729 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:36 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:61 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/extz.py:23 @@ -123,8 +123,8 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315 -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:347 -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:355 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:348 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:356 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:156 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:364 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:367 @@ -145,11 +145,11 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/email.py:152 #: /home/kovid/work/calibre/src/calibre/gui2/email.py:167 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:401 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1012 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1188 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1279 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1285 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:82 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:212 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:231 @@ -158,23 +158,23 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single_download.py:160 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single_download.py:164 #: /home/kovid/work/calibre/src/calibre/gui2/store/google_books_plugin.py:90 -#: /home/kovid/work/calibre/src/calibre/gui2/store/search/models.py:156 +#: /home/kovid/work/calibre/src/calibre/gui2/store/search/models.py:163 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:199 #: /home/kovid/work/calibre/src/calibre/library/cli.py:217 #: /home/kovid/work/calibre/src/calibre/library/database.py:914 #: /home/kovid/work/calibre/src/calibre/library/database2.py:506 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514 #: /home/kovid/work/calibre/src/calibre/library/database2.py:525 -#: /home/kovid/work/calibre/src/calibre/library/database2.py:1804 -#: /home/kovid/work/calibre/src/calibre/library/database2.py:1941 -#: /home/kovid/work/calibre/src/calibre/library/database2.py:2948 -#: /home/kovid/work/calibre/src/calibre/library/database2.py:2950 -#: /home/kovid/work/calibre/src/calibre/library/database2.py:3083 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:1805 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:1942 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:2949 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:2951 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:3084 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159 #: /home/kovid/work/calibre/src/calibre/library/server/xml.py:79 -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:131 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:134 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:46 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:64 #: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:78 @@ -328,7 +328,7 @@ msgid "Change the way calibre behaves" msgstr "" #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:906 -#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:220 +#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:221 msgid "Add your own columns" msgstr "" @@ -801,7 +801,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445 #: /home/kovid/work/calibre/src/calibre/library/database2.py:302 #: /home/kovid/work/calibre/src/calibre/library/database2.py:315 -#: /home/kovid/work/calibre/src/calibre/library/database2.py:2812 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:2813 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159 msgid "News" msgstr "" @@ -809,8 +809,8 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2669 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:643 -#: /home/kovid/work/calibre/src/calibre/library/database2.py:2772 -#: /home/kovid/work/calibre/src/calibre/library/database2.py:2790 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:2773 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:2791 msgid "Catalog" msgstr "" @@ -2304,27 +2304,32 @@ msgstr "" msgid "Extract common e-book formats from archives (zip/rar) files. Also try to autodetect if they are actually cbz/cbr files." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:145 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:51 +msgid "Value: unknown field " +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:144 msgid "TEMPLATE ERROR" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:628 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:627 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:563 msgid "No" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:628 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:627 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:563 +#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:601 msgid "Yes" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:723 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:728 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1023 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single_download.py:132 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources.py:152 #: /home/kovid/work/calibre/src/calibre/gui2/store/mobileread/models.py:23 @@ -2334,32 +2339,32 @@ msgstr "" msgid "Title" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:724 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:729 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1024 #: /home/kovid/work/calibre/src/calibre/gui2/store/mobileread/models.py:23 msgid "Author(s)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:725 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:730 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources.py:149 msgid "Publisher" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:726 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:731 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49 msgid "Producer" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:727 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:732 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:871 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources.py:147 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211 msgid "Comments" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:729 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:734 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72 @@ -2370,7 +2375,7 @@ msgstr "" msgid "Tags" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:731 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:736 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73 @@ -2380,16 +2385,16 @@ msgstr "" msgid "Series" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:732 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:737 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources.py:154 msgid "Language" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:734 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:739 msgid "Timestamp" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:736 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:741 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single_download.py:132 @@ -2397,7 +2402,7 @@ msgstr "" msgid "Published" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:738 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:743 msgid "Rights" msgstr "" @@ -3086,131 +3091,131 @@ msgstr "" msgid "Do not remove font color from output. This is only useful when txt-output-formatting is set to textile. Textile is the only formatting that supports setting font color. If this option is not specified font color will not be set and default to the color displayed by the reader (generally this is black)." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:103 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104 msgid "Send file to storage card instead of main memory by default" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106 msgid "Confirm before deleting" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:107 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108 msgid "Main window geometry" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:109 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110 msgid "Notify when a new version is available" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:111 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:112 msgid "Use Roman numerals for series number" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:114 msgid "Sort tags list by name, popularity, or rating" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:115 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116 msgid "Match tags by any or all." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:117 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:118 msgid "Number of covers to show in the cover browsing mode" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:119 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:120 msgid "Defaults for conversion to LRF" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:121 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:122 msgid "Options for the LRF ebook viewer" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:124 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:125 msgid "Formats that are viewed using the internal viewer" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:126 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:127 msgid "Columns to be displayed in the book list" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:127 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:128 msgid "Automatically launch content server on application startup" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:128 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:129 msgid "Oldest news kept in database" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:129 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:130 msgid "Show system tray icon" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:132 msgid "Upload downloaded news to device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134 msgid "Delete books from library after uploading to device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136 msgid "Show the cover flow in a separate window instead of in the main calibre window" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138 msgid "Disable notifications from the system tray icon" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140 msgid "Default action to perform when send to device button is clicked" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145 msgid "Start searching as you type. If this is disabled then search will only take place when the Enter or Return key is pressed." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:147 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148 msgid "When searching, show all books with search results highlighted instead of showing only the matches. You can use the N or F3 keys to go to the next match." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:165 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:166 msgid "Maximum number of simultaneous conversion/news download jobs. This number is twice the actual value for historical reasons." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:169 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:170 msgid "Download social metadata (tags/rating/etc.)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:171 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:172 msgid "Overwrite author and title with new metadata" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:173 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:174 msgid "Automatically download the cover, if available" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:175 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:176 msgid "Limit max simultaneous jobs to number of CPUs" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:177 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:178 msgid "The layout of the user interface" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:179 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:180 msgid "Show the average rating per item indication in the tag browser" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:181 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:182 msgid "Disable UI animations" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:186 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:187 msgid "tag browser categories not to display" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:461 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:462 msgid "Choose Files" msgstr "" @@ -3340,11 +3345,11 @@ msgstr "" msgid "Select books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:328 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:329 msgid "Merged some books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:329 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:330 msgid "The following duplicate books were found and incoming book formats were processed and merged into your Calibre database according to your automerge settings:" msgstr "" @@ -3364,9 +3369,9 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:376 #: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:127 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/store.py:78 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/store.py:97 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/store.py:106 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/store.py:83 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/store.py:102 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/store.py:111 #: /home/kovid/work/calibre/src/calibre/gui2/actions/tweak_epub.py:28 #: /home/kovid/work/calibre/src/calibre/gui2/actions/view.py:139 #: /home/kovid/work/calibre/src/calibre/gui2/actions/view.py:185 @@ -3644,7 +3649,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:405 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:167 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:101 -#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:854 +#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:857 msgid "Not allowed" msgstr "" @@ -4071,7 +4076,7 @@ msgid "Move to next highlighted match" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/actions/next_match.py:13 -#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:373 +#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:388 msgid "N" msgstr "" @@ -4274,35 +4279,35 @@ msgstr "" msgid "Stores" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/store.py:38 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/store.py:43 #: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/chooser_dialog.py:18 -#: /home/kovid/work/calibre/src/calibre/gui2/store/search/search.py:261 +#: /home/kovid/work/calibre/src/calibre/gui2/store/search/search.py:270 msgid "Choose stores" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/store.py:78 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/store.py:97 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/store.py:106 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/store.py:83 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/store.py:102 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/store.py:111 msgid "Cannot search" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/store.py:125 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/store.py:130 msgid "Calibre helps you find the ebooks you want by searching the websites of various commercial and public domain book sources for you." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/store.py:129 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/store.py:134 msgid "Using the integrated search you can easily find which store has the book you are looking for, at the best price. You also get DRM status and other useful information." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/store.py:133 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/store.py:138 msgid "All transactions (paid or otherwise) are handled between you and the book seller. Calibre is not part of this process and any issues related to a purchase should be directed to the website you are buying from. Be sure to double check that any books you get will work with your e-book reader, especially if the book you are buying has DRM." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/store.py:143 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/store.py:148 msgid "Show this message again" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/store.py:144 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/store.py:149 msgid "About Get Books" msgstr "" @@ -4569,7 +4574,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar_ui.py:110 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:85 -#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/chooser_widget_ui.py:57 +#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/chooser_widget_ui.py:79 #: /home/kovid/work/calibre/src/calibre/gui2/store/mobileread/store_dialog_ui.py:75 #: /home/kovid/work/calibre/src/calibre/gui2/store/search/search_ui.py:133 #: /home/kovid/work/calibre/src/calibre/gui2/store/search/search_ui.py:139 @@ -4606,7 +4611,7 @@ msgid "Book %s of %s" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:144 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1027 msgid "Collections" msgstr "" @@ -4732,7 +4737,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar_ui.py:98 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:87 #: /home/kovid/work/calibre/src/calibre/gui2/store/basic_config_widget_ui.py:37 -#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/chooser_widget_ui.py:55 +#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/chooser_widget_ui.py:77 #: /home/kovid/work/calibre/src/calibre/gui2/store/config/search/search_widget_ui.py:98 #: /home/kovid/work/calibre/src/calibre/gui2/store/config/search_widget_ui.py:98 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:123 @@ -5333,7 +5338,7 @@ msgstr "" msgid "" "

    This wizard will help you choose an appropriate font size key for your needs. Just enter the base font size of the input document and then enter an input font size. The wizard will display what font size it will be mapped to, by the font rescaling algorithm. You can adjust the algorithm by adjusting the output base font size and font key below. When you find values suitable for you, click OK.

    \n" "

    By default, if the output base font size is zero and/or no font size key is specified, calibre will use the values from the current Output Profile.

    \n" -"

    See the User Manual for a discussion of how font size rescaling works.

    " +"

    See the User Manual for a discussion of how font size rescaling works.

    " msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:108 @@ -5396,7 +5401,7 @@ msgid "Modify the document text and structure using common patterns." msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:113 -msgid "Heuristic processing means that calibre will scan your book for common patterns and fix them. As the name implies, this involves guesswork, which means that it could end up worsening the result of a conversion, if calibre guesses wrong. Therefore, it is disabled by default. Often, if a conversion does not turn out as you expect, turning on heuristics can improve matters. Read more about the various heuristic processing options in the User Manual." +msgid "Heuristic processing means that calibre will scan your book for common patterns and fix them. As the name implies, this involves guesswork, which means that it could end up worsening the result of a conversion, if calibre guesses wrong. Therefore, it is disabled by default. Often, if a conversion does not turn out as you expect, turning on heuristics can improve matters. Read more about the various heuristic processing options in the User Manual." msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:114 @@ -5810,8 +5815,9 @@ msgid "PDB Output" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_output_ui.py:48 -#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/adv_search_builder_ui.py:215 -#: /home/kovid/work/calibre/src/calibre/gui2/store/search/adv_search_builder_ui.py:195 +#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/adv_search_builder_ui.py:225 +#: /home/kovid/work/calibre/src/calibre/gui2/store/mobileread/adv_search_builder_ui.py:186 +#: /home/kovid/work/calibre/src/calibre/gui2/store/search/adv_search_builder_ui.py:205 msgid "&Format:" msgstr "" @@ -5970,7 +5976,7 @@ msgstr "" #: #: /home/kovid/work/calibre/src/calibre/gui2/convert/search_and_replace_ui.py:154 -msgid "

    Search and replace uses regular expressions. See the regular expressions tutorial to get started with regular expressions. Also clicking the wizard buttons below will allow you to test your regular expression against the current input document." +msgid "

    Search and replace uses regular expressions. See the regular expressions tutorial to get started with regular expressions. Also clicking the wizard buttons below will allow you to test your regular expression against the current input document." msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/convert/single.py:173 @@ -6286,7 +6292,7 @@ msgid "(A regular expression)" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:89 -msgid "

    For example, to match all h2 tags that have class=\"chapter\", set tag to h2, attribute to class and value to chapter.

    Leaving attribute blank will match any attribute and leaving value blank will match any value. Setting tag to * will match any tag.

    To learn more advanced usage of XPath see the XPath Tutorial." +msgid "

    For example, to match all h2 tags that have class=\"chapter\", set tag to h2, attribute to class and value to chapter.

    Leaving attribute blank will match any attribute and leaving value blank will match any value. Setting tag to * will match any tag.

    To learn more advanced usage of XPath see the XPath Tutorial." msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:128 @@ -6312,8 +6318,8 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:128 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:148 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:230 -#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:263 -#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:267 +#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:279 +#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:283 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1139 msgid "Undefined" msgstr "" @@ -6569,7 +6575,7 @@ msgstr "" #: #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget.py:148 -#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:421 +#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:437 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard.py:273 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/save_template.py:61 msgid "Invalid template" @@ -6577,7 +6583,7 @@ msgstr "" #: #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget.py:149 -#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:422 +#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:438 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard.py:274 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/save_template.py:62 msgid "The template %s is invalid:" @@ -6937,7 +6943,8 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:97 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:211 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:73 -#: /home/kovid/work/calibre/src/calibre/gui2/store/search/adv_search_builder_ui.py:189 +#: /home/kovid/work/calibre/src/calibre/gui2/store/mobileread/adv_search_builder_ui.py:181 +#: /home/kovid/work/calibre/src/calibre/gui2/store/search/adv_search_builder_ui.py:199 msgid "&Title:" msgstr "" @@ -6951,12 +6958,12 @@ msgid "&Profile:" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:24 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:218 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:222 msgid "&OK" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:219 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:223 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:65 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:233 msgid "&Cancel" @@ -7011,7 +7018,7 @@ msgstr "" #: #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1025 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:73 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:321 @@ -8019,91 +8026,105 @@ msgid "Negate" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:198 -#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/adv_search_builder_ui.py:196 -#: /home/kovid/work/calibre/src/calibre/gui2/store/search/adv_search_builder_ui.py:176 +#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/adv_search_builder_ui.py:206 +#: /home/kovid/work/calibre/src/calibre/gui2/store/mobileread/adv_search_builder_ui.py:168 +#: /home/kovid/work/calibre/src/calibre/gui2/store/search/adv_search_builder_ui.py:186 msgid "Advanced Search" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:199 -#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/adv_search_builder_ui.py:197 -#: /home/kovid/work/calibre/src/calibre/gui2/store/search/adv_search_builder_ui.py:177 +#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/adv_search_builder_ui.py:207 +#: /home/kovid/work/calibre/src/calibre/gui2/store/mobileread/adv_search_builder_ui.py:169 +#: /home/kovid/work/calibre/src/calibre/gui2/store/search/adv_search_builder_ui.py:187 msgid "&What kind of match to use:" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:200 -#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/adv_search_builder_ui.py:198 -#: /home/kovid/work/calibre/src/calibre/gui2/store/search/adv_search_builder_ui.py:178 +#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/adv_search_builder_ui.py:208 +#: /home/kovid/work/calibre/src/calibre/gui2/store/mobileread/adv_search_builder_ui.py:170 +#: /home/kovid/work/calibre/src/calibre/gui2/store/search/adv_search_builder_ui.py:188 msgid "Contains: the word or phrase matches anywhere in the metadata field" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:201 -#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/adv_search_builder_ui.py:199 -#: /home/kovid/work/calibre/src/calibre/gui2/store/search/adv_search_builder_ui.py:179 +#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/adv_search_builder_ui.py:209 +#: /home/kovid/work/calibre/src/calibre/gui2/store/mobileread/adv_search_builder_ui.py:171 +#: /home/kovid/work/calibre/src/calibre/gui2/store/search/adv_search_builder_ui.py:189 msgid "Equals: the word or phrase must match the entire metadata field" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:202 -#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/adv_search_builder_ui.py:200 -#: /home/kovid/work/calibre/src/calibre/gui2/store/search/adv_search_builder_ui.py:180 +#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/adv_search_builder_ui.py:210 +#: /home/kovid/work/calibre/src/calibre/gui2/store/mobileread/adv_search_builder_ui.py:172 +#: /home/kovid/work/calibre/src/calibre/gui2/store/search/adv_search_builder_ui.py:190 msgid "Regular expression: the expression must match anywhere in the metadata field" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:203 -#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/adv_search_builder_ui.py:201 -#: /home/kovid/work/calibre/src/calibre/gui2/store/search/adv_search_builder_ui.py:181 +#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/adv_search_builder_ui.py:211 +#: /home/kovid/work/calibre/src/calibre/gui2/store/mobileread/adv_search_builder_ui.py:173 +#: /home/kovid/work/calibre/src/calibre/gui2/store/search/adv_search_builder_ui.py:191 msgid "Find entries that have..." msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:204 -#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/adv_search_builder_ui.py:202 -#: /home/kovid/work/calibre/src/calibre/gui2/store/search/adv_search_builder_ui.py:182 +#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/adv_search_builder_ui.py:212 +#: /home/kovid/work/calibre/src/calibre/gui2/store/mobileread/adv_search_builder_ui.py:174 +#: /home/kovid/work/calibre/src/calibre/gui2/store/search/adv_search_builder_ui.py:192 msgid "&All these words:" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:205 -#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/adv_search_builder_ui.py:203 -#: /home/kovid/work/calibre/src/calibre/gui2/store/search/adv_search_builder_ui.py:183 +#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/adv_search_builder_ui.py:213 +#: /home/kovid/work/calibre/src/calibre/gui2/store/mobileread/adv_search_builder_ui.py:175 +#: /home/kovid/work/calibre/src/calibre/gui2/store/search/adv_search_builder_ui.py:193 msgid "This exact &phrase:" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:206 -#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/adv_search_builder_ui.py:204 -#: /home/kovid/work/calibre/src/calibre/gui2/store/search/adv_search_builder_ui.py:184 +#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/adv_search_builder_ui.py:214 +#: /home/kovid/work/calibre/src/calibre/gui2/store/mobileread/adv_search_builder_ui.py:176 +#: /home/kovid/work/calibre/src/calibre/gui2/store/search/adv_search_builder_ui.py:194 msgid "&One or more of these words:" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:207 -#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/adv_search_builder_ui.py:205 -#: /home/kovid/work/calibre/src/calibre/gui2/store/search/adv_search_builder_ui.py:185 +#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/adv_search_builder_ui.py:215 +#: /home/kovid/work/calibre/src/calibre/gui2/store/mobileread/adv_search_builder_ui.py:177 +#: /home/kovid/work/calibre/src/calibre/gui2/store/search/adv_search_builder_ui.py:195 msgid "But dont show entries that have..." msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:208 -#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/adv_search_builder_ui.py:206 -#: /home/kovid/work/calibre/src/calibre/gui2/store/search/adv_search_builder_ui.py:186 +#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/adv_search_builder_ui.py:216 +#: /home/kovid/work/calibre/src/calibre/gui2/store/mobileread/adv_search_builder_ui.py:178 +#: /home/kovid/work/calibre/src/calibre/gui2/store/search/adv_search_builder_ui.py:196 msgid "Any of these &unwanted words:" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:209 -#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/adv_search_builder_ui.py:207 -#: /home/kovid/work/calibre/src/calibre/gui2/store/search/adv_search_builder_ui.py:187 -msgid "See the User Manual for more help" +#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/adv_search_builder_ui.py:217 +#: /home/kovid/work/calibre/src/calibre/gui2/store/search/adv_search_builder_ui.py:197 +msgid "See the User Manual for more help" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:210 -#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/adv_search_builder_ui.py:208 -#: /home/kovid/work/calibre/src/calibre/gui2/store/search/adv_search_builder_ui.py:188 +#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/adv_search_builder_ui.py:218 +#: /home/kovid/work/calibre/src/calibre/gui2/store/mobileread/adv_search_builder_ui.py:180 +#: /home/kovid/work/calibre/src/calibre/gui2/store/search/adv_search_builder_ui.py:198 msgid "A&dvanced Search" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:212 -#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/adv_search_builder_ui.py:210 -#: /home/kovid/work/calibre/src/calibre/gui2/store/search/adv_search_builder_ui.py:190 +#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/adv_search_builder_ui.py:220 +#: /home/kovid/work/calibre/src/calibre/gui2/store/mobileread/adv_search_builder_ui.py:182 +#: /home/kovid/work/calibre/src/calibre/gui2/store/search/adv_search_builder_ui.py:200 msgid "Enter the title." msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:213 -#: /home/kovid/work/calibre/src/calibre/gui2/store/search/adv_search_builder_ui.py:191 +#: /home/kovid/work/calibre/src/calibre/gui2/store/mobileread/adv_search_builder_ui.py:183 +#: /home/kovid/work/calibre/src/calibre/gui2/store/search/adv_search_builder_ui.py:201 msgid "&Author:" msgstr "" @@ -8126,14 +8147,16 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:219 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/template_functions_ui.py:101 -#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/adv_search_builder_ui.py:213 -#: /home/kovid/work/calibre/src/calibre/gui2/store/search/adv_search_builder_ui.py:193 +#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/adv_search_builder_ui.py:223 +#: /home/kovid/work/calibre/src/calibre/gui2/store/mobileread/adv_search_builder_ui.py:184 +#: /home/kovid/work/calibre/src/calibre/gui2/store/search/adv_search_builder_ui.py:203 msgid "&Clear" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:220 -#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/adv_search_builder_ui.py:214 -#: /home/kovid/work/calibre/src/calibre/gui2/store/search/adv_search_builder_ui.py:194 +#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/adv_search_builder_ui.py:224 +#: /home/kovid/work/calibre/src/calibre/gui2/store/mobileread/adv_search_builder_ui.py:185 +#: /home/kovid/work/calibre/src/calibre/gui2/store/search/adv_search_builder_ui.py:204 msgid "Search only in specific fields:" msgstr "" @@ -8341,6 +8364,10 @@ msgstr "" msgid "Ctrl+S" msgstr "" +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:249 +msgid "EXCEPTION: " +msgstr "" + #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog_ui.py:71 msgid "Function &name:" msgstr "" @@ -8355,53 +8382,90 @@ msgid "Python &code:" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_line_editor.py:32 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_line_editor.py:36 msgid "Open Template Editor" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_line_editor.py:35 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_line_editor.py:39 msgid "Open Tag Wizard" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_line_editor.py:41 -#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:408 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_line_editor.py:45 +#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:424 msgid "Edit template" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_line_editor.py:48 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_line_editor.py:52 msgid "Invalid text" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_line_editor.py:49 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_line_editor.py:53 msgid "The text in the box was not generated by this wizard" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_line_editor.py:60 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_line_editor.py:64 msgid "Tag Wizard" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_line_editor.py:68 -msgid "Tags (more than one per box permitted)" +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_line_editor.py:72 +msgid "Tags (see the popup help for more information)" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_line_editor.py:69 -msgid "Color" +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_line_editor.py:74 +msgid "You can enter more than one tag per box, separated by commas. The comparison ignores letter case.
    A tag value can be a regular expression. Check the box to turn them on. When using regular expressions, note that the wizard puts anchors (^ and $) around the expression, so you must ensure your expression matches from the beginning to the end of the tag.
    Regular expression examples:" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_line_editor.py:115 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_line_editor.py:82 +msgid "

  • .* matches any tag. No empty tags are checked, so you don't need to worry about empty strings
  • A.* matches any tag beginning with A
  • .*mystery.* matches any tag containing the word \"mystery\"
    • " +msgstr "" + +#: +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_line_editor.py:89 +msgid "is RE" +msgstr "" + +#: +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_line_editor.py:91 +msgid "Check this box if the tag box contains regular expressions" +msgstr "" + +#: +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_line_editor.py:94 +msgid "Color if tag found" +msgstr "" + +#: +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_line_editor.py:96 +msgid "At least one of the two color boxes must have a value. Leave one color box empty if you want the template to use the next line in this wizard. If both boxes are filled in, the rest of the lines in this wizard will be ignored." +msgstr "" + +#: +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_line_editor.py:101 +msgid "Color if tag not found" +msgstr "" + +#: +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_line_editor.py:103 +msgid "This box is usually filled in only on the last test. If it is filled in before the last test, then the color for tag found box must be empty or all the rest of the tests will be ignored." +msgstr "" + +#: +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_line_editor.py:178 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_line_editor.py:183 msgid "Invalid color" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_line_editor.py:116 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_line_editor.py:179 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_line_editor.py:184 msgid "The color {0} is not valid" msgstr "" @@ -8623,7 +8687,7 @@ msgid "&Add feed" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:286 -msgid "For help with writing advanced news recipes, please visit User Recipes" +msgid "For help with writing advanced news recipes, please visit User Recipes" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:287 @@ -8719,7 +8783,7 @@ msgstr "" msgid "" "
    \n" "

    Set a regular expression pattern to use when trying to guess ebook metadata from filenames.

    \n" -"

    A tutorial on using regular expressions is available.

    \n" +"

    A tutorial on using regular expressions is available.

    \n" "

    Use the Test functionality below to test your regular expression on a few sample filenames (remember to include the file extension). The group names for the various metadata entries are documented in tooltips.

    " msgstr "" @@ -8941,7 +9005,7 @@ msgid "Show books in the main memory of the device" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/layout.py:72 -#: /home/kovid/work/calibre/src/calibre/library/database2.py:1023 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:1024 msgid "Card A" msgstr "" @@ -8950,7 +9014,7 @@ msgid "Show books in storage card A" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/layout.py:74 -#: /home/kovid/work/calibre/src/calibre/library/database2.py:1025 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:1026 msgid "Card B" msgstr "" @@ -8990,7 +9054,7 @@ msgstr "" msgid "Copy current search text (instead of search name)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:373 +#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:388 msgid "Y" msgstr "" @@ -9008,75 +9072,75 @@ msgstr "" msgid "Modified" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:760 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1317 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:766 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1323 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:797 msgid "The lookup/search name is \"{0}\"" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:766 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1319 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:772 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1325 msgid "This book's UUID is \"{0}\"" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1016 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022 msgid "In Library" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1026 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311 msgid "Size" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1297 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1303 msgid "Marked for deletion" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1300 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1306 msgid "Double click to edit me

    " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:158 +#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:159 msgid "Hide column %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:163 +#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:164 msgid "Sort on %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:164 +#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:165 msgid "Ascending" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:167 +#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:168 msgid "Descending" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:179 +#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:180 msgid "Change text alignment for %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:181 +#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:182 msgid "Left" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:181 +#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:182 msgid "Right" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:182 +#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:183 msgid "Center" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:201 +#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:202 msgid "Show column" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:213 +#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:214 msgid "Restore default layout" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:855 +#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:858 msgid "Dropping onto a device is not supported. First add the book to the calibre library." msgstr "" @@ -9995,7 +10059,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:41 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:73 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:153 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:156 msgid "Yes/No" msgstr "" @@ -10027,7 +10091,7 @@ msgstr "" #: #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:152 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:155 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27 #: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/models.py:21 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124 @@ -10071,117 +10135,127 @@ msgid "Selected column is not a user-defined column" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:154 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:157 msgid "My Tags" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:155 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:158 msgid "My Series" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:156 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:159 msgid "My Rating" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:157 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:160 msgid "People" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:185 -msgid "No lookup name was provided" -msgstr "" - -#: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:189 -msgid "The lookup name must contain only lower case letters, digits and underscores, and start with a letter" +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:187 +msgid "Examples: The format {0:0>4d} gives a 4-digit number with leading zeros. The format {0:d} days prints the number then the word \"days\"" msgstr "" #: #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:192 +msgid "Examples: The format {0:.1f} gives a floating point number with 1 digit after the decimal point. The format Price: $ {0:,.2f} prints \"Price $ \" then displays the number with 2 digits after the decimal point and thousands separated by commas." +msgstr "" + +#: +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:201 +msgid "No lookup name was provided" +msgstr "" + +#: +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:205 +msgid "The lookup name must contain only lower case letters, digits and underscores, and start with a letter" +msgstr "" + +#: +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:208 msgid "Lookup names cannot end with _index, because these names are reserved for the index of a series column." msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:202 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:218 msgid "No column heading was provided" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:212 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:228 msgid "The lookup name %s is already used" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:224 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:240 msgid "The heading %s is already used" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:235 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:251 msgid "You must enter a template for composite columns" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:244 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:260 msgid "You must enter at least one value for enumeration columns" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:248 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:264 msgid "You cannot provide the empty value, as it is included by default" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:252 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:268 msgid "The value \"{0}\" is in the list more than once" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:260 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:276 msgid "The colors box must be empty or contain the same number of items as the value box" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:265 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:281 msgid "The color {0} is unknown" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:201 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:217 msgid "&Lookup name" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:202 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:218 msgid "Column &heading" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:203 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:219 msgid "Used for searching the column. Must contain only digits and lower case letters." msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:204 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:220 msgid "Column heading in the library view and category name in the tag browser" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:205 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:221 msgid "&Column type" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:206 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:222 msgid "What kind of information will be kept in the column." msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:207 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:223 msgid "" "Show check marks in the GUI. Values of 'yes', 'checked', and 'true'\n" "will show a green check. Values of 'no', 'unchecked', and 'false' will show a red X.\n" @@ -10189,22 +10263,22 @@ msgid "" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:210 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:226 msgid "Show checkmarks" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:211 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:227 msgid "Check this box if this column contains names, like the authors column." msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:212 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:228 msgid "Contains names" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:213 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:229 msgid "" "

    Date format. Use 1-4 'd's for day, 1-4 'M's for month, and 2 or 4 'y's for year.

    \n" "

    For example:\n" @@ -10215,68 +10289,86 @@ msgid "" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:219 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:235 msgid "Use MMM yyyy for month + year, yyyy for year only" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:220 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:236 msgid "Default: dd MMM yyyy." msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:221 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:237 +msgid "" +"

    The format specifier must begin with {0:\n" +"and end with } You can have text before and after the format specifier.\n" +" " +msgstr "" + +#: +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:240 +msgid "

    Default: Not formatted. For format language details see the python documentation" +msgstr "" + +#: +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:241 msgid "Format for &dates" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:222 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:242 +msgid "Format for &numbers" +msgstr "" + +#: +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:243 msgid "&Template" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:223 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:244 msgid "Field template. Uses the same syntax as save templates." msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:224 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:245 msgid "Similar to save templates. For example, {title} {isbn}" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:225 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:246 msgid "Default: (nothing)" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:226 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:247 msgid "&Sort/search column by" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:227 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:248 msgid "How this column should handled in the GUI when sorting and searching" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:228 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:249 msgid "If checked, this column will appear in the tags browser as a category" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:229 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:250 msgid "Show in tags browser" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:230 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:235 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:251 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:256 msgid "Values" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:231 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:252 msgid "" "A comma-separated list of permitted values. The empty value is always\n" "included, and is the default. For example, the list 'one,two,three' has\n" @@ -10284,19 +10376,19 @@ msgid "" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:234 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:255 msgid "The empty string is always the first value" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:236 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:257 msgid "" "A list of color names to use when displaying an item. The\n" "list must be empty or contain a color for each value." msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:238 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:259 msgid "Colors" msgstr "" @@ -10418,7 +10510,7 @@ msgid "Always" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:132 -msgid "Automatic" +msgid "If there is enough room" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:133 @@ -10438,7 +10530,7 @@ msgid "Partitioned" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:163 -msgid "Here you can specify coloring rules for columns shown in the library view. Choose the column you wish to color, then supply a template that specifies the color to use based on the values in the column. There is a tutorial on using templates." +msgid "Here you can specify coloring rules for columns shown in the library view. Choose the column you wish to color, then supply a template that specifies the color to use based on the values in the column. There is a tutorial on using templates." msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:170 @@ -10920,7 +11012,7 @@ msgid "Search for plugin" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:230 -#: /home/kovid/work/calibre/src/calibre/gui2/store/search/search.py:297 +#: /home/kovid/work/calibre/src/calibre/gui2/store/search/search.py:321 msgid "No matches" msgstr "" @@ -11561,7 +11653,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:95 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:279 -#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/chooser_widget_ui.py:58 +#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/chooser_widget_ui.py:80 #: /home/kovid/work/calibre/src/calibre/gui2/store/mobileread/store_dialog_ui.py:76 #: /home/kovid/work/calibre/src/calibre/gui2/store/search/search_ui.py:134 #: /home/kovid/work/calibre/src/calibre/gui2/store/search_ui.py:109 @@ -11646,6 +11738,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83 +#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/chooser_widget_ui.py:83 #: /home/kovid/work/calibre/src/calibre/gui2/store/search/search_ui.py:138 #: /home/kovid/work/calibre/src/calibre/gui2/store/search_ui.py:113 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:351 @@ -11718,54 +11811,87 @@ msgid "Open store in external web browswer" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/adv_search_builder_ui.py:209 +#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/adv_search_builder_ui.py:219 msgid "&Name:" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/adv_search_builder_ui.py:211 +#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/adv_search_builder_ui.py:221 msgid "&Description:" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/adv_search_builder_ui.py:212 +#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/adv_search_builder_ui.py:222 msgid "&Headquarters:" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/adv_search_builder_ui.py:216 +#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/adv_search_builder_ui.py:226 msgid "Enabled:" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/adv_search_builder_ui.py:217 +#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/adv_search_builder_ui.py:227 msgid "DRM:" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/adv_search_builder_ui.py:218 -#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/adv_search_builder_ui.py:220 +#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/adv_search_builder_ui.py:228 +#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/adv_search_builder_ui.py:230 +#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/adv_search_builder_ui.py:233 +#: /home/kovid/work/calibre/src/calibre/gui2/store/search/adv_search_builder_ui.py:207 msgid "true" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/adv_search_builder_ui.py:219 -#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/adv_search_builder_ui.py:221 +#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/adv_search_builder_ui.py:229 +#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/adv_search_builder_ui.py:231 +#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/adv_search_builder_ui.py:234 +#: /home/kovid/work/calibre/src/calibre/gui2/store/search/adv_search_builder_ui.py:208 msgid "false" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/adv_search_builder_ui.py:222 +#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/adv_search_builder_ui.py:232 +#: /home/kovid/work/calibre/src/calibre/gui2/store/search/adv_search_builder_ui.py:206 +msgid "Affiliate:" +msgstr "" + +#: +#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/adv_search_builder_ui.py:235 msgid "Nam&e/Description ..." msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/chooser_widget_ui.py:56 +#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/chooser_widget_ui.py:78 #: /home/kovid/work/calibre/src/calibre/gui2/store/search/search_ui.py:132 #: /home/kovid/work/calibre/src/calibre/gui2/store/search_ui.py:108 msgid "Query:" msgstr "" +#: +#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/chooser_widget_ui.py:81 +msgid "Enable" +msgstr "" + +#: +#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/chooser_widget_ui.py:82 +#: /home/kovid/work/calibre/src/calibre/gui2/store/search/search_ui.py:136 +#: /home/kovid/work/calibre/src/calibre/gui2/store/search_ui.py:111 +msgid "All" +msgstr "" + +#: +#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/chooser_widget_ui.py:84 +#: /home/kovid/work/calibre/src/calibre/gui2/store/search/search_ui.py:137 +#: /home/kovid/work/calibre/src/calibre/gui2/store/search_ui.py:112 +msgid "Invert" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/models.py:21 +msgid "Affiliate" +msgstr "" + #: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/models.py:21 msgid "Enabled" msgstr "" @@ -11779,33 +11905,44 @@ msgid "No DRM" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/models.py:108 -msgid "

    This store is currently diabled and cannot be used in other parts of calibre.

    " +#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/models.py:129 +msgid "This store is currently diabled and cannot be used in other parts of calibre." msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/models.py:110 -msgid "

    This store is currently enabled and can be used in other parts of calibre.

    " +#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/models.py:131 +msgid "This store is currently enabled and can be used in other parts of calibre." msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/models.py:115 -msgid "

    This store only distributes ebooks with DRM.

    " +#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/models.py:136 +msgid "This store only distributes ebooks with DRM." msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/models.py:117 -msgid "

    This store distributes ebooks with DRM. It may have some titles without DRM, but you will need to check on a per title basis.

    " +#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/models.py:138 +msgid "This store distributes ebooks with DRM. It may have some titles without DRM, but you will need to check on a per title basis." msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/models.py:119 -msgid "

    This store is headquartered in %s. This is a good indication of what market the store caters to. However, this does not necessarily mean that the store is limited to that market only.

    " +#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/models.py:140 +msgid "This store is headquartered in %s. This is a good indication of what market the store caters to. However, this does not necessarily mean that the store is limited to that market only." msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/models.py:121 -msgid "

    This store distributes ebooks in the following formats: %s

    " +#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/models.py:143 +#: /home/kovid/work/calibre/src/calibre/gui2/store/search/models.py:203 +msgid "Buying from this store supports the calibre developer: %s." +msgstr "" + +#: +#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/models.py:145 +msgid "This store distributes ebooks in the following formats: %s" +msgstr "" + +#: +#: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/results_view.py:47 +msgid "Configure..." msgstr "" #: @@ -11898,6 +12035,17 @@ msgstr "" msgid "Not Available" msgstr "" +#: +#: /home/kovid/work/calibre/src/calibre/gui2/store/mobileread/adv_search_builder_ui.py:179 +msgid "See the User Manual for more help" +msgstr "" + +#: +#: /home/kovid/work/calibre/src/calibre/gui2/store/mobileread/adv_search_builder_ui.py:187 +#: /home/kovid/work/calibre/src/calibre/gui2/store/search/adv_search_builder_ui.py:209 +msgid "Titl&e/Author/Price ..." +msgstr "" + #: #: /home/kovid/work/calibre/src/calibre/gui2/store/mobileread/cache_progress_dialog_ui.py:51 msgid "Updating book cache" @@ -11955,13 +12103,12 @@ msgid "Search:" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/store/search/adv_search_builder_ui.py:192 +#: /home/kovid/work/calibre/src/calibre/gui2/store/search/adv_search_builder_ui.py:202 msgid "&Price:" msgstr "" -#: -#: /home/kovid/work/calibre/src/calibre/gui2/store/search/adv_search_builder_ui.py:196 -msgid "Titl&e/Author/Price ..." +#: /home/kovid/work/calibre/src/calibre/gui2/store/search/models.py:36 +msgid "" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/store/search/models.py:36 @@ -11972,31 +12119,35 @@ msgstr "" msgid "Price" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/store/search/models.py:180 +#: /home/kovid/work/calibre/src/calibre/gui2/store/search/models.py:191 msgid "Detected price as: %s. Check with the store before making a purchase to verify this price is correct. This price often does not include promotions the store may be running." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/store/search/models.py:183 +#: /home/kovid/work/calibre/src/calibre/gui2/store/search/models.py:194 msgid "This book as been detected as having DRM restrictions. This book may not work with your reader and you will have limitations placed upon you as to what you can do with this book. Check with the store before making any purchases to ensure you can actually read this book." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/store/search/models.py:185 +#: /home/kovid/work/calibre/src/calibre/gui2/store/search/models.py:196 msgid "This book has been detected as being DRM Free. You should be able to use this book on any device provided it is in a format calibre supports for conversion. However, before making a purchase double check the DRM status with the store. The store may not be disclosing the use of DRM." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/store/search/models.py:187 +#: /home/kovid/work/calibre/src/calibre/gui2/store/search/models.py:198 msgid "The DRM status of this book could not be determined. There is a very high likelihood that this book is actually DRM restricted." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/store/search/search.py:252 +#: /home/kovid/work/calibre/src/calibre/gui2/store/search/search.py:105 +msgid "Buying from this store supports the calibre developer: %s

    " +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/store/search/search.py:261 msgid "Customize get books search" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/store/search/search.py:262 +#: /home/kovid/work/calibre/src/calibre/gui2/store/search/search.py:271 msgid "Configure search" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/store/search/search.py:297 +#: /home/kovid/work/calibre/src/calibre/gui2/store/search/search.py:321 msgid "Couldn't find any books matching your query." msgstr "" @@ -12005,16 +12156,6 @@ msgstr "" msgid "Get Books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/store/search/search_ui.py:136 -#: /home/kovid/work/calibre/src/calibre/gui2/store/search_ui.py:111 -msgid "All" -msgstr "" - -#: /home/kovid/work/calibre/src/calibre/gui2/store/search/search_ui.py:137 -#: /home/kovid/work/calibre/src/calibre/gui2/store/search_ui.py:112 -msgid "Invert" -msgstr "" - #: /home/kovid/work/calibre/src/calibre/gui2/store/search/search_ui.py:140 msgid "Open a selected book in the system's web browser" msgstr "" @@ -12381,15 +12522,19 @@ msgstr "" msgid "%s has been updated to version %s. See the new features." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/update.py:58 +#: /home/kovid/work/calibre/src/calibre/gui2/update.py:55 +msgid "Update only if one of the new features or bug fixes is important to you. If the current version works well for you, do not update." +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/update.py:60 msgid "Update available!" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/update.py:63 +#: /home/kovid/work/calibre/src/calibre/gui2/update.py:65 msgid "Show this notification for future updates" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/update.py:68 +#: /home/kovid/work/calibre/src/calibre/gui2/update.py:70 msgid "&Get update" msgstr "" @@ -12960,7 +13105,7 @@ msgid "

    Demo videos

    Videos demonstrating the various features of calibre msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/wizard/finish_ui.py:51 -msgid "

    User Manual

    A User Manual is also available online." +msgid "

    User Manual

    A User Manual is also available online." msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/wizard/kindle_ui.py:49 @@ -13166,63 +13311,63 @@ msgid "Turn on the &content server" msgstr "" #: /home/kovid/work/calibre/src/calibre/library/caches.py:161 -#: /home/kovid/work/calibre/src/calibre/library/caches.py:562 -#: /home/kovid/work/calibre/src/calibre/library/caches.py:576 -#: /home/kovid/work/calibre/src/calibre/library/caches.py:586 +#: /home/kovid/work/calibre/src/calibre/library/caches.py:567 +#: /home/kovid/work/calibre/src/calibre/library/caches.py:581 +#: /home/kovid/work/calibre/src/calibre/library/caches.py:591 msgid "checked" msgstr "" #: /home/kovid/work/calibre/src/calibre/library/caches.py:161 -#: /home/kovid/work/calibre/src/calibre/library/caches.py:562 -#: /home/kovid/work/calibre/src/calibre/library/caches.py:576 -#: /home/kovid/work/calibre/src/calibre/library/caches.py:586 -#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:214 +#: /home/kovid/work/calibre/src/calibre/library/caches.py:567 +#: /home/kovid/work/calibre/src/calibre/library/caches.py:581 +#: /home/kovid/work/calibre/src/calibre/library/caches.py:591 +#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:216 msgid "yes" msgstr "" #: /home/kovid/work/calibre/src/calibre/library/caches.py:163 -#: /home/kovid/work/calibre/src/calibre/library/caches.py:561 -#: /home/kovid/work/calibre/src/calibre/library/caches.py:573 -#: /home/kovid/work/calibre/src/calibre/library/caches.py:583 +#: /home/kovid/work/calibre/src/calibre/library/caches.py:566 +#: /home/kovid/work/calibre/src/calibre/library/caches.py:578 +#: /home/kovid/work/calibre/src/calibre/library/caches.py:588 msgid "unchecked" msgstr "" #: /home/kovid/work/calibre/src/calibre/library/caches.py:163 -#: /home/kovid/work/calibre/src/calibre/library/caches.py:561 -#: /home/kovid/work/calibre/src/calibre/library/caches.py:573 -#: /home/kovid/work/calibre/src/calibre/library/caches.py:583 -#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:214 +#: /home/kovid/work/calibre/src/calibre/library/caches.py:566 +#: /home/kovid/work/calibre/src/calibre/library/caches.py:578 +#: /home/kovid/work/calibre/src/calibre/library/caches.py:588 +#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:216 msgid "no" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/caches.py:356 +#: /home/kovid/work/calibre/src/calibre/library/caches.py:361 msgid "today" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/caches.py:359 +#: /home/kovid/work/calibre/src/calibre/library/caches.py:364 msgid "yesterday" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/caches.py:362 +#: /home/kovid/work/calibre/src/calibre/library/caches.py:367 msgid "thismonth" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/caches.py:365 -#: /home/kovid/work/calibre/src/calibre/library/caches.py:366 +#: /home/kovid/work/calibre/src/calibre/library/caches.py:370 +#: /home/kovid/work/calibre/src/calibre/library/caches.py:371 msgid "daysago" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/caches.py:563 -#: /home/kovid/work/calibre/src/calibre/library/caches.py:580 +#: /home/kovid/work/calibre/src/calibre/library/caches.py:568 +#: /home/kovid/work/calibre/src/calibre/library/caches.py:585 msgid "blank" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/caches.py:563 -#: /home/kovid/work/calibre/src/calibre/library/caches.py:580 +#: /home/kovid/work/calibre/src/calibre/library/caches.py:568 +#: /home/kovid/work/calibre/src/calibre/library/caches.py:585 msgid "empty" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/caches.py:564 +#: /home/kovid/work/calibre/src/calibre/library/caches.py:569 msgid "Invalid boolean query \"{0}\"" msgstr "" @@ -13980,19 +14125,19 @@ msgstr "" msgid "%sAverage rating is %3.1f" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/database2.py:1021 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:1022 msgid "Main" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/database2.py:3109 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:3110 msgid "

    Migrating old database to ebook library in %s

    " msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/database2.py:3138 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:3139 msgid "Copying %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/database2.py:3155 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:3156 msgid "Compacting database" msgstr "" @@ -14117,8 +14262,8 @@ msgstr "" msgid "Replace whitespace with underscores." msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:370 -#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:398 +#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:372 +#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:400 msgid "Requested formats not available" msgstr "" @@ -14447,35 +14592,35 @@ msgstr "" msgid "syntax error - program ends before EOF" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/formatter.py:101 -msgid "unknown id " +#: /home/kovid/work/calibre/src/calibre/utils/formatter.py:103 +msgid "Unknown identifier " msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/formatter.py:107 +#: /home/kovid/work/calibre/src/calibre/utils/formatter.py:110 msgid "unknown function {0}" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/formatter.py:126 +#: /home/kovid/work/calibre/src/calibre/utils/formatter.py:129 msgid "missing closing parenthesis" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/formatter.py:145 +#: /home/kovid/work/calibre/src/calibre/utils/formatter.py:148 msgid "expression is not function or constant" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/formatter.py:179 +#: /home/kovid/work/calibre/src/calibre/utils/formatter.py:182 msgid "format: type {0} requires an integer value, got {1}" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/formatter.py:185 +#: /home/kovid/work/calibre/src/calibre/utils/formatter.py:188 msgid "format: type {0} requires a decimal (float) value, got {1}" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/formatter.py:296 +#: /home/kovid/work/calibre/src/calibre/utils/formatter.py:299 msgid "%s: unknown function" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/formatter.py:343 +#: /home/kovid/work/calibre/src/calibre/utils/formatter.py:348 msgid "No such variable " msgstr "" @@ -14483,167 +14628,171 @@ msgstr "" msgid "No documentation provided" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:79 -msgid "Exception " -msgstr "" - -#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:97 +#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:90 msgid "strcmp(x, y, lt, eq, gt) -- does a case-insensitive comparison of x and y as strings. Returns lt if x < y. Returns eq if x == y. Otherwise returns gt." msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:112 +#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:105 msgid "cmp(x, y, lt, eq, gt) -- compares x and y after converting both to numbers. Returns lt if x < y. Returns eq if x == y. Otherwise returns gt." msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:127 +#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:120 msgid "strcat(a, b, ...) -- can take any number of arguments. Returns a string formed by concatenating all the arguments" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:140 +#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:133 msgid "add(x, y) -- returns x + y. Throws an exception if either x or y are not numbers." msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:150 +#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:143 msgid "subtract(x, y) -- returns x - y. Throws an exception if either x or y are not numbers." msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:160 +#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:153 msgid "multiply(x, y) -- returns x * y. Throws an exception if either x or y are not numbers." msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:170 +#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:163 msgid "divide(x, y) -- returns x / y. Throws an exception if either x or y are not numbers." msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:180 +#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:173 msgid "template(x) -- evaluates x as a template. The evaluation is done in its own context, meaning that variables are not shared between the caller and the template evaluation. Because the { and } characters are special, you must use [[ for the { character and ]] for the } character; they are converted automatically. For example, template('[[title_sort]]') will evaluate the template {title_sort} and return its value." msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:195 +#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:188 msgid "eval(template) -- evaluates the template, passing the local variables (those 'assign'ed to) instead of the book metadata. This permits using the template processor to construct complex results from local variables." msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:208 +#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:201 msgid "assign(id, val) -- assigns val to id, then returns val. id must be an identifier, not an expression" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:218 +#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:211 msgid "print(a, b, ...) -- prints the arguments to standard output. Unless you start calibre from the command line (calibre-debug -g), the output will go to a black hole." msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:229 +#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:222 msgid "field(name) -- returns the metadata field named by name" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:237 +#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:230 msgid "raw_field(name) -- returns the metadata field named by name without applying any formatting." msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:246 +#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:239 msgid "substr(str, start, end) -- returns the start'th through the end'th characters of str. The first character in str is the zero'th character. If end is negative, then it indicates that many characters counting from the right. If end is zero, then it indicates the last character. For example, substr('12345', 1, 0) returns '2345', and substr('12345', 1, -1) returns '234'." msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:259 +#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:252 msgid "lookup(val, pattern, field, pattern, field, ..., else_field) -- like switch, except the arguments are field (metadata) names, not text. The value of the appropriate field will be fetched and used. Note that because composite columns are fields, you can use this function in one composite field to use the value of some other composite field. This is extremely useful when constructing variable save paths" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:274 +#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:267 msgid "lookup requires either 2 or an odd number of arguments" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:286 +#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:279 msgid "test(val, text if not empty, text if empty) -- return `text if not empty` if the field is not empty, otherwise return `text if empty`" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:298 +#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:291 msgid "contains(val, pattern, text if match, text if not match) -- checks if field contains matches for the regular expression `pattern`. Returns `text if match` if matches are found, otherwise it returns `text if no match`" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:313 +#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:306 msgid "switch(val, pattern, value, pattern, value, ..., else_value) -- for each `pattern, value` pair, checks if the field matches the regular expression `pattern` and if so, returns that `value`. If no pattern matches, then else_value is returned. You can have as many `pattern, value` pairs as you want" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:321 +#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:314 msgid "switch requires an odd number of arguments" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:333 +#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:326 msgid "in_list(val, separator, pattern, found_val, not_found_val) -- treat val as a list of items separated by separator, comparing the pattern against each value in the list. If the pattern matches a value, return found_val, otherwise return not_found_val." msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:349 +#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:342 +msgid "str_in_list(val, separator, string, found_val, not_found_val) -- treat val as a list of items separated by separator, comparing the string against each value in the list. If the string matches a value, return found_val, otherwise return not_found_val. If the string contains separators, then it is also treated as a list and each value is checked." +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:361 msgid "re(val, pattern, replacement) -- return the field after applying the regular expression. All instances of `pattern` are replaced with `replacement`. As in all of calibre, these are python-compatible regular expressions" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:360 +#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:372 msgid "ifempty(val, text if empty) -- return val if val is not empty, otherwise return `text if empty`" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:372 +#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:384 msgid "shorten(val, left chars, middle text, right chars) -- Return a shortened version of the field, consisting of `left chars` characters from the beginning of the field, followed by `middle text`, followed by `right chars` characters from the end of the string. `Left chars` and `right chars` must be integers. For example, assume the title of the book is `Ancient English Laws in the Times of Ivanhoe`, and you want it to fit in a space of at most 15 characters. If you use {title:shorten(9,-,5)}, the result will be `Ancient E-nhoe`. If the field's length is less than left chars + right chars + the length of `middle text`, then the field will be used intact. For example, the title `The Dome` would not be changed." msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:397 +#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:409 msgid "count(val, separator) -- interprets the value as a list of items separated by `separator`, returning the number of items in the list. Most lists use a comma as the separator, but authors uses an ampersand. Examples: {tags:count(,)}, {authors:count(&)}" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:408 +#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:420 msgid "list_item(val, index, separator) -- interpret the value as a list of items separated by `separator`, returning the `index`th item. The first item is number zero. The last item can be returned using `list_item(-1,separator)`. If the item is not in the list, then the empty value is returned. The separator has the same meaning as in the count function." msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:428 +#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:440 msgid "select(val, key) -- interpret the value as a comma-separated list of items, with the items being \"id:value\". Find the pair with theid equal to key, and return the corresponding value." msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:445 +#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:457 msgid "sublist(val, start_index, end_index, separator) -- interpret the value as a list of items separated by `separator`, returning a new list made from the `start_index`th to the `end_index`th item. The first item is number zero. If an index is negative, then it counts from the end of the list. As a special case, an end_index of zero is assumed to be the length of the list. Examples using basic template mode and assuming that the tags column (which is comma-separated) contains \"A, B, C\": {tags:sublist(0,1,\\,)} returns \"A\". {tags:sublist(-1,0,\\,)} returns \"C\". {tags:sublist(0,-1,\\,)} returns \"A, B\"." msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:474 +#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:486 msgid "subitems(val, start_index, end_index) -- This function is used to break apart lists of items such as genres. It interprets the value as a comma-separated list of items, where each item is a period-separated list. Returns a new list made by first finding all the period-separated items, then for each such item extracting the start_index`th to the `end_index`th components, then combining the results back together. The first component in a period-separated list has an index of zero. If an index is negative, then it counts from the end of the list. As a special case, an end_index of zero is assumed to be the length of the list. Example using basic template mode and assuming a #genre value of \"A.B.C\": {#genre:subitems(0,1)} returns \"A\". {#genre:subitems(0,2)} returns \"A.B\". {#genre:subitems(1,0)} returns \"B.C\". Assuming a #genre value of \"A.B.C, D.E.F\", {#genre:subitems(0,1)} returns \"A, D\". {#genre:subitems(0,2)} returns \"A.B, D.E\"" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:511 +#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:523 msgid "format_date(val, format_string) -- format the value, which must be a date field, using the format_string, returning a string. The formatting codes are: d : the day as number without a leading zero (1 to 31) dd : the day as number with a leading zero (01 to 31) ddd : the abbreviated localized day name (e.g. \"Mon\" to \"Sun\"). dddd : the long localized day name (e.g. \"Monday\" to \"Sunday\"). M : the month as number without a leading zero (1 to 12). MM : the month as number with a leading zero (01 to 12) MMM : the abbreviated localized month name (e.g. \"Jan\" to \"Dec\"). MMMM : the long localized month name (e.g. \"January\" to \"December\"). yy : the year as two digit number (00 to 99). yyyy : the year as four digit number. iso : the date with time and timezone. Must be the only format present" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:539 +#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:551 msgid "uppercase(val) -- return value of the field in upper case" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:547 +#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:559 msgid "lowercase(val) -- return value of the field in lower case" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:555 +#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:567 msgid "titlecase(val) -- return value of the field in title case" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:563 +#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:575 msgid "capitalize(val) -- return value of the field capitalized" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:571 -msgid "booksize() -- return value of the field capitalized" +#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:583 +msgid "booksize() -- return value of the size field" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:584 +#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:596 +msgid "ondevice() -- return Yes if ondevice is set, otherwise return the empty string" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:607 msgid "first_non_empty(value, value, ...) -- returns the first value that is not empty. If all values are empty, then the empty value is returned.You can have as many values as you want." msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:600 +#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:623 msgid "and(value, value, ...) -- returns the string \"1\" if all values are not empty, otherwise returns the empty string. This function works well with test or first_non_empty. You can have as many values as you want." msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:616 +#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:639 msgid "or(value, value, ...) -- returns the string \"1\" if any value is not empty, otherwise returns the empty string. This function works well with test or first_non_empty. You can have as many values as you want." msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:632 +#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:655 msgid "not(value) -- returns the string \"1\" if the value is empty, otherwise returns the empty string. This function works well with test or first_non_empty. You can have as many values as you want." msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:648 +#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:671 msgid "merge_lists(list1, list2, separator) -- return a list made by merging the items in list1 and list2, removing duplicate items using a case-insensitive compare. If items differ in case, the one in list1 is used. The items in list1 and list2 are separated by separator, as are the items in the returned list." msgstr "" @@ -14663,147 +14812,147 @@ msgstr "" msgid "Working..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:95 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:98 msgid "Brazilian Portuguese" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:96 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:99 msgid "English (UK)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:97 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:100 msgid "Simplified Chinese" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:98 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:101 msgid "Chinese (HK)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:99 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:102 msgid "Traditional Chinese" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:100 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:103 msgid "English" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:101 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:104 msgid "English (Australia)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:102 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:105 msgid "English (New Zealand)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:103 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:106 msgid "English (Canada)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:104 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:107 msgid "English (India)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:105 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:108 msgid "English (Thailand)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:106 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:109 msgid "English (Cyprus)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:107 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:110 msgid "English (Czechoslovakia)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:108 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:111 msgid "English (Pakistan)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:109 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:112 msgid "English (Croatia)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:110 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:113 msgid "English (Indonesia)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:111 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:114 msgid "English (Israel)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:112 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:115 msgid "English (Singapore)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:113 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:116 msgid "English (Yemen)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:114 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:117 msgid "English (Ireland)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:115 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:118 msgid "English (China)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:116 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:119 msgid "Spanish (Paraguay)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:117 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:120 msgid "Spanish (Uruguay)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:118 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:121 msgid "Spanish (Argentina)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:119 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:122 msgid "Spanish (Mexico)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:120 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:123 msgid "Spanish (Cuba)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:121 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:124 msgid "Spanish (Chile)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:122 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:125 msgid "Spanish (Ecuador)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:123 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:126 msgid "Spanish (Honduras)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:124 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:127 msgid "Spanish (Venezuela)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:125 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:128 msgid "Spanish (Bolivia)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:126 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:129 msgid "Spanish (Nicaragua)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:127 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:130 msgid "German (AT)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:128 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:131 msgid "French (BE)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:129 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:132 msgid "Dutch (NL)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:130 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:133 msgid "Dutch (BE)" msgstr ""