Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Tag browser: Allow changing the sub-categorization scheme from the context menu

Browse Source
This commit is contained in:
Kovid Goyal 2011-01-02 11:09:57 -07:00
parent 21daa3c72a
commit 59b476a8b2
2 changed files with 52 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
resources/default_tweaks.py
View File

@ -61,7 +61,7 @@ categories_use_field_for_author_name = 'author'
# first letter (categories_collapse_model = 'first letter') or into equal-sized # first letter (categories_collapse_model = 'first letter') or into equal-sized
# groups (categories_collapse_model = 'partition'). If sorting by average rating # groups (categories_collapse_model = 'partition'). If sorting by average rating
# or by popularity, then 'partition' is always used. The addition of # or by popularity, then 'partition' is always used. The addition of
# subcategories can be disabled by setting categories_collapse_more_than = 0. # subcategories can be disabled by setting categories_collapse_model='disable'.
# When using partition, the format of the subcategory label is controlled by a # When using partition, the format of the subcategory label is controlled by a
# template: categories_collapsed_name_template if sorting by name, # template: categories_collapsed_name_template if sorting by name,
# categories_collapsed_rating_template if sorting by average rating, and # categories_collapsed_rating_template if sorting by average rating, and
@ -76,11 +76,16 @@ categories_use_field_for_author_name = 'author'
# avg_rating: the averate rating of all the books referencing this item # avg_rating: the averate rating of all the books referencing this item
# sort: the sort value. For authors, this is the author_sort for that author # sort: the sort value. For authors, this is the author_sort for that author
# category: the category (e.g., authors, series) that the item is in. # category: the category (e.g., authors, series) that the item is in.
# Possible values:
# category_collapse_model: 'disable', 'first letter', 'partition'
# categories_collapse_more_than: a number greater than or equal to 0
# the templates: any valid template using only 'first' and 'last'
categories_collapse_model = 'first letter'
categories_collapse_more_than = 50 categories_collapse_more_than = 50
categories_collapsed_name_template = '{first.sort:shorten(4,'',0)} - {last.sort:shorten(4,'',0)}' categories_collapsed_name_template = '{first.sort:shorten(4,'',0)} - {last.sort:shorten(4,'',0)}'
categories_collapsed_rating_template = '{first.avg_rating:4.2f:ifempty(0)} - {last.avg_rating:4.2f:ifempty(0)}' categories_collapsed_rating_template = '{first.avg_rating:4.2f:ifempty(0)} - {last.avg_rating:4.2f:ifempty(0)}'
categories_collapsed_popularity_template = '{first.count:d} - {last.count:d}' categories_collapsed_popularity_template = '{first.count:d} - {last.count:d}'
categories_collapse_model = 'first letter'
# Set whether boolean custom columns are two- or three-valued. # Set whether boolean custom columns are two- or three-valued.
# Two-values for true booleans # Two-values for true booleans

58
src/calibre/gui2/tag_view.py
View File

@ -94,6 +94,10 @@ class TagsView(QTreeView): # {{{
self.setDropIndicatorShown(True) self.setDropIndicatorShown(True)
self.setAutoExpandDelay(500) self.setAutoExpandDelay(500)
self.pane_is_visible = False self.pane_is_visible = False
if tweaks['categories_collapse_more_than'] == 0:
self.collapse_model = 'disable'
else:
self.collapse_model = tweaks['categories_collapse_model']
def set_pane_is_visible(self, to_what): def set_pane_is_visible(self, to_what):
pv = self.pane_is_visible pv = self.pane_is_visible
@ -106,7 +110,8 @@ class TagsView(QTreeView): # {{{
self._model = TagsModel(db, parent=self, self._model = TagsModel(db, parent=self,
hidden_categories=self.hidden_categories, hidden_categories=self.hidden_categories,
search_restriction=None, search_restriction=None,
drag_drop_finished=self.drag_drop_finished) drag_drop_finished=self.drag_drop_finished,
collapse_model=self.collapse_model)
self.pane_is_visible = True # because TagsModel.init did a recount self.pane_is_visible = True # because TagsModel.init did a recount
self.sort_by = sort_by self.sort_by = sort_by
self.tag_match = tag_match self.tag_match = tag_match
@ -194,6 +199,11 @@ class TagsView(QTreeView): # {{{
self.hidden_categories.add(category) self.hidden_categories.add(category)
elif action == 'show': elif action == 'show':
self.hidden_categories.discard(category) self.hidden_categories.discard(category)
elif action == 'categorization':
changed = self.collapse_model != category
self.collapse_model = category
if changed:
self.set_new_model(self._model.get_filter_categories_by())
elif action == 'defaults': elif action == 'defaults':
self.hidden_categories.clear() self.hidden_categories.clear()
config.set('tag_browser_hidden_categories', self.hidden_categories) config.set('tag_browser_hidden_categories', self.hidden_categories)
@ -279,6 +289,23 @@ class TagsView(QTreeView): # {{{
self.context_menu.addAction(_('Show all categories'), self.context_menu.addAction(_('Show all categories'),
partial(self.context_menu_handler, action='defaults')) partial(self.context_menu_handler, action='defaults'))
m = self.context_menu.addMenu(_('Change sub-categorization scheme'))
da = m.addAction('Disable',
partial(self.context_menu_handler, action='categorization', category='disable'))
fla = m.addAction('By first letter',
partial(self.context_menu_handler, action='categorization', category='first letter'))
pa = m.addAction('Partition',
partial(self.context_menu_handler, action='categorization', category='partition'))
if self.collapse_model == 'disable':
da.setCheckable(True)
da.setChecked(True)
elif self.collapse_model == 'first letter':
fla.setCheckable(True)
fla.setChecked(True)
else:
pa.setCheckable(True)
pa.setChecked(True)
if not self.context_menu.isEmpty(): if not self.context_menu.isEmpty():
self.context_menu.popup(self.mapToGlobal(point)) self.context_menu.popup(self.mapToGlobal(point))
return True return True
@ -340,7 +367,8 @@ class TagsView(QTreeView): # {{{
hidden_categories=self.hidden_categories, hidden_categories=self.hidden_categories,
search_restriction=self.search_restriction, search_restriction=self.search_restriction,
drag_drop_finished=self.drag_drop_finished, drag_drop_finished=self.drag_drop_finished,
filter_categories_by=filter_categories_by) filter_categories_by=filter_categories_by,
collapse_model=self.collapse_model)
self.setModel(self._model) self.setModel(self._model)
except: except:
# The DB must be gone. Set the model to None and hope that someone # The DB must be gone. Set the model to None and hope that someone
@ -469,7 +497,7 @@ class TagsModel(QAbstractItemModel): # {{{
def __init__(self, db, parent, hidden_categories=None, def __init__(self, db, parent, hidden_categories=None,
search_restriction=None, drag_drop_finished=None, search_restriction=None, drag_drop_finished=None,
filter_categories_by=None): filter_categories_by=None, collapse_model='disable'):
QAbstractItemModel.__init__(self, parent) QAbstractItemModel.__init__(self, parent)
# must do this here because 'QPixmap: Must construct a QApplication # must do this here because 'QPixmap: Must construct a QApplication
@ -490,6 +518,7 @@ class TagsModel(QAbstractItemModel): # {{{
self.search_restriction = search_restriction self.search_restriction = search_restriction
self.row_map = [] self.row_map = []
self.filter_categories_by = filter_categories_by self.filter_categories_by = filter_categories_by
self.collapse_model = collapse_model
# get_node_tree cannot return None here, because row_map is empty # get_node_tree cannot return None here, because row_map is empty
data = self.get_node_tree(config['sort_tags_by']) data = self.get_node_tree(config['sort_tags_by'])
@ -681,15 +710,18 @@ class TagsModel(QAbstractItemModel): # {{{
return False return False
row_index = -1 row_index = -1
collapse = tweaks['categories_collapse_more_than'] collapse = tweaks['categories_collapse_more_than']
collapse_model = tweaks['categories_collapse_model'] collapse_model = self.collapse_model
if sort_by == 'name': if collapse == 0:
collapse_template = tweaks['categories_collapsed_name_template'] collapse_model = 'disable'
elif sort_by == 'rating': elif collapse_model != 'disable':
collapse_model = 'partition' if sort_by == 'name':
collapse_template = tweaks['categories_collapsed_rating_template'] collapse_template = tweaks['categories_collapsed_name_template']
else: elif sort_by == 'rating':
collapse_model = 'partition' collapse_model = 'partition'
collapse_template = tweaks['categories_collapsed_popularity_template'] collapse_template = tweaks['categories_collapsed_rating_template']
else:
collapse_model = 'partition'
collapse_template = tweaks['categories_collapsed_popularity_template']
collapse_letter = None collapse_letter = None
for i, r in enumerate(self.row_map): for i, r in enumerate(self.row_map):
@ -724,7 +756,7 @@ class TagsModel(QAbstractItemModel): # {{{
tag.avg_rating = None tag.avg_rating = None
tag.state = state_map.get(tag.name, 0) tag.state = state_map.get(tag.name, 0)
if collapse > 0 and cat_len > collapse: if collapse_model != 'disable' and cat_len > collapse:
if collapse_model == 'partition': if collapse_model == 'partition':
if (idx % collapse) == 0: if (idx % collapse) == 0:
d = {'first': tag} d = {'first': tag}