' +
_('If you want to color a field based on tags, then click the '
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
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/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%s
' % result.title) @@ -187,6 +198,9 @@ 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: + if result.affiliate: + return QVariant('' + _('Buying from this store supports the calibre developer: %s.') % result.plugin_author + '
') elif role == Qt.SizeHintRole: return QSize(64, 64) return NONE @@ -206,6 +220,11 @@ class Matches(QAbstractItemModel): text = 'c' elif col == 4: text = result.store_name + elif col == 5: + if result.affiliate: + text = 'a' + else: + text = 'b' return text def sort(self, col, order, reset=True): @@ -234,6 +253,7 @@ class SearchFilter(SearchQueryParser): USABLE_LOCATIONS = [ 'all', + 'affiliate', 'author', 'authors', 'cover', @@ -284,6 +304,7 @@ class SearchFilter(SearchQueryParser): all_locs = set(self.USABLE_LOCATIONS) - set(['all']) locations = all_locs if location == 'all' else [location] q = { + 'affiliate': attrgetter('affiliate'), 'author': lambda x: x.author.lower(), 'cover': attrgetter('cover_url'), 'drm': attrgetter('drm'), @@ -298,23 +319,35 @@ class SearchFilter(SearchQueryParser): for locvalue in locations: accessor = q[locvalue] if query == 'true': - if locvalue == 'drm': + # True/False. + if locvalue == 'affiliate': + if accessor(sr): + matches.add(sr) + # Special that are treated as True/False. + elif locvalue == 'drm': if accessor(sr) == SearchResult.DRM_LOCKED: matches.add(sr) + # Testing for something or nothing. else: if accessor(sr) is not None: matches.add(sr) continue if query == 'false': - if locvalue == 'drm': + # True/False. + if locvalue == 'affiliate': + if not accessor(sr): + matches.add(sr) + # Special that are treated as True/False. + elif locvalue == 'drm': if accessor(sr) == SearchResult.DRM_UNLOCKED: matches.add(sr) + # Testing for something or nothing. else: if accessor(sr) is None: matches.add(sr) continue - # this is bool, so can't match below - if locvalue == 'drm': + # this is bool or treated as bool, so can't match below. + if locvalue in ('affiliate', 'drm'): continue try: ### Can't separate authors because comma is used for name sep and author sep diff --git a/src/calibre/gui2/store/search/search.py b/src/calibre/gui2/store/search/search.py index faeaf507c9..e1ad24943d 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,25 @@ 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')) + 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.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 - store_list_layout.addStretch() + store_list_layout.setRowStretch(store_list_layout.rowCount(), 10) self.store_list.setWidget(stores_check_widget) def build_adv_search(self): @@ -244,24 +251,41 @@ 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) 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')) + # 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() diff --git a/src/calibre/gui2/store/search_result.py b/src/calibre/gui2/store/search_result.py index 7bf361157e..7d6ac5acad 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'+
_('%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!'))
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 @@