Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-06-23 15:30:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

port the new tb tooltip to the new backend

Browse Source
This commit is contained in:
Kovid Goyal 2013-01-27 23:27:58 +05:30
parent 08fc8e274a
commit aa256bb189
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calibre/db/categories.py
View File

@ -35,6 +35,8 @@ class Tag(object):
self.avg_rating = avg/2.0 if avg is not None else 0 self.avg_rating = avg/2.0 if avg is not None else 0
self.sort = sort self.sort = sort
self.use_sort_as_name = use_sort_as_name self.use_sort_as_name = use_sort_as_name
if tooltip is None:
tooltip = '(%s:%s)'%(category, name)
if self.avg_rating > 0: if self.avg_rating > 0:
if tooltip: if tooltip:
tooltip = tooltip + ': ' tooltip = tooltip + ': '
@ -65,7 +67,6 @@ def find_categories(field_metadata):
def create_tag_class(category, fm, icon_map): def create_tag_class(category, fm, icon_map):
cat = fm[category] cat = fm[category]
icon = None icon = None
tooltip = None if category in {'formats', 'identifiers'} else ('(' + category + ')')
label = fm.key_to_label(category) label = fm.key_to_label(category)
if icon_map: if icon_map:
if not fm.is_custom_field(category): if not fm.is_custom_field(category):
@ -87,8 +88,7 @@ def create_tag_class(category, fm, icon_map):
use_sort_as_name = False use_sort_as_name = False
return partial(Tag, use_sort_as_name=use_sort_as_name, icon=icon, return partial(Tag, use_sort_as_name=use_sort_as_name, icon=icon,
tooltip=tooltip, is_editable=is_editable, is_editable=is_editable, category=category)
category=category)
def clean_user_categories(dbcache): def clean_user_categories(dbcache):
user_cats = dbcache.pref('user_categories', {}) user_cats = dbcache.pref('user_categories', {})

2
src/calibre/library/database2.py
View File

@ -1934,8 +1934,6 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
is_editable = category not in ['news', 'rating', 'languages'] is_editable = category not in ['news', 'rating', 'languages']
categories[category] = [tag_class(formatter(r.n), count=r.c, id=r.id, categories[category] = [tag_class(formatter(r.n), count=r.c, id=r.id,
avg=avgr(r), sort=r.s, icon=icon, avg=avgr(r), sort=r.s, icon=icon,
tooltip=u'({0}:{1})'.format(category,
formatter(r.n)),
category=category, category=category,
id_set=r.id_set, is_editable=is_editable, id_set=r.id_set, is_editable=is_editable,
use_sort_as_name=use_sort_as_name) use_sort_as_name=use_sort_as_name)